diff --git a/app/javascript/glitch/components/status/container.js b/app/javascript/glitch/components/status/container.js
index da2771c0b61..24261e7633e 100644
--- a/app/javascript/glitch/components/status/container.js
+++ b/app/javascript/glitch/components/status/container.js
@@ -102,6 +102,16 @@ const makeMapStateToProps = () => {
   const mapStateToProps = (state, ownProps) => {
 
     let status = getStatus(state, ownProps.id);
+
+    if(status === null) {
+      console.error(`ERROR! NULL STATUS! ${ownProps.id}`);
+      // work-around: find first good status
+      for (let k of state.get('statuses').keys()) {
+        status = getStatus(state, k);
+        if (status !== null) break;
+      }
+    }
+
     let reblogStatus = status.get('reblog', null);
     let account = undefined;
     let prepend = undefined;