diff --git a/react/containers/ChannelSelect/view.jsx b/react/containers/ChannelSelect/view.jsx
index 745949de..dbab4316 100644
--- a/react/containers/ChannelSelect/view.jsx
+++ b/react/containers/ChannelSelect/view.jsx
@@ -21,7 +21,7 @@ class ChannelSelect extends React.Component {
     }
   }
   componentWillReceiveProps ({ loggedInChannelName }) {
-    if (loggedInChannelName) {
+    if (loggedInChannelName && (loggedInChannelName !== this.props.loggedInChannelName)) {
       this.selectOption(loggedInChannelName);
     }
   }