diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx
index 3fdb9a80c..1d1560003 100644
--- a/app/assets/javascripts/components/components/status.jsx
+++ b/app/assets/javascripts/components/components/status.jsx
@@ -45,6 +45,10 @@ const Status = React.createClass({
     let media = '';
     let { status, ...other } = this.props;
 
+    if (status === null) {
+      return <div />;
+    }
+
     if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
       let displayName = status.getIn(['account', 'display_name']);