Will this fix the issue?

2 files changed, 8 insertions, 5 deletions

diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx
index 543759113..d3acff3f0 100644
--- a/app/assets/javascripts/components/components/status.jsx
+++ b/app/assets/javascripts/components/components/status.jsx
@@ -45,8 +45,6 @@ const Status = React.createClass({
 
     var { status, ...other } = this.props;
 
-    console.log(status, this.props);
-
     if (status.get('reblog') !== null) {
       let displayName = status.getIn(['account', 'display_name']);
 
diff --git a/app/assets/javascripts/components/selectors/index.jsx b/app/assets/javascripts/components/selectors/index.jsx
index c3c007f28..91f900f90 100644
--- a/app/assets/javascripts/components/selectors/index.jsx
+++ b/app/assets/javascripts/components/selectors/index.jsx
@@ -29,15 +29,20 @@ const getAccountTimelineIds = (state, id) => state.getIn(['timelines', 'accounts
 
 const assembleStatus = (id, statuses, accounts) => {
   let status = statuses.get(id, null);
+  let reblog = null;
 
   if (status === null) {
     return null;
   }
 
-  let reblog = statuses.get(status.get('reblog'), null);
+  if (status.get('reblog', null) !== null) {
+    reblog = statuses.get(status.get('reblog'), null);
 
-  if (reblog !== null) {
-    reblog = reblog.set('account', accounts.get(reblog.get('account')));
+    if (reblog !== null) {
+      reblog = reblog.set('account', accounts.get(reblog.get('account')));
+    } else {
+      return null;
+    }
   }
 
   return status.set('reblog', reblog).set('account', accounts.get(status.get('account')));