diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index ad2d6c45c3..df1df22a87 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -346,8 +346,8 @@ export default class Sidebar extends React.Component {
                 nextChannel = allChannels[nextIndex];
                 ChannelActions.goToChannel(nextChannel);
                 this.updateScrollbarOnChannelChange(nextChannel);
-                this.isSwitchingChannel = false;
             }
+            this.isSwitchingChannel = false;
         }
     }