1 files changed, 4 insertions, 3 deletions
diff --git a/webapp/components/post_view/post_view_cache.jsx b/webapp/components/post_view/post_view_cache.jsx
index c1b278c35..3b6123b09 100644
--- a/webapp/components/post_view/post_view_cache.jsx
+++ b/webapp/components/post_view/post_view_cache.jsx
@@ -17,11 +17,12 @@ export default class PostViewCache extends React.Component {
 
         this.onChannelChange = this.onChannelChange.bind(this);
 
+        const currentChannelId = ChannelStore.getCurrentId();
         const channel = ChannelStore.getCurrent();
 
         this.state = {
-            currentChannelId: channel.id,
-            channels: [channel]
+            currentChannelId,
+            channels: channel ? [channel] : []
         };
     }
 
@@ -40,7 +41,7 @@ export default class PostViewCache extends React.Component {
         const channels = Object.assign([], this.state.channels);
         const currentChannel = ChannelStore.getCurrent();
 
-        if (currentChannel == null) {
+        if (!currentChannel) {
             return;
         }