diff --git a/ui/component/selectChannel/view.jsx b/ui/component/selectChannel/view.jsx
index 8813feff6..9e554c70f 100644
--- a/ui/component/selectChannel/view.jsx
+++ b/ui/component/selectChannel/view.jsx
@@ -47,8 +47,8 @@ class ChannelSelection extends React.PureComponent<Props, State> {
   }
 
   componentDidUpdate() {
-    const { channels } = this.props;
-    if (!channels) {
+    const { channels, fetchingChannels } = this.props;
+    if (!fetchingChannels && !channels) {
       this.setState({ addingChannel: true });
     }
   }