1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/action_creators/global_actions.jsx b/webapp/action_creators/global_actions.jsx
index 5641246f9..bf1d82aee 100644
--- a/webapp/action_creators/global_actions.jsx
+++ b/webapp/action_creators/global_actions.jsx
@@ -223,10 +223,15 @@ export function emitPostRecievedEvent(post, msg) {
         AsyncClient.getChannel(post.channel_id);
     }
 
+    var websocketMessageProps = null;
+    if (msg) {
+        websocketMessageProps = msg.props;
+    }
+
     AppDispatcher.handleServerAction({
         type: ActionTypes.RECEIVED_POST,
         post,
-        websocketMessageProps: msg.props
+        websocketMessageProps
     });
 }