diff --git a/app/screens/channel/channel_post_list/channel_post_list.js b/app/screens/channel/channel_post_list/channel_post_list.js
index 832ce5690..15e730558 100644
--- a/app/screens/channel/channel_post_list/channel_post_list.js
+++ b/app/screens/channel/channel_post_list/channel_post_list.js
@@ -54,6 +54,7 @@ export default class ChannelPostList extends PureComponent {
         const {postIds: nextPostIds} = nextProps;
 
         let visiblePostIds = this.state.visiblePostIds;
+        const channelSwitch = nextProps.channelId !== this.props.channelId;
 
         if (nextPostIds !== this.props.postIds || nextProps.postVisibility !== this.props.postVisibility) {
             visiblePostIds = this.getVisiblePostIds(nextProps);
@@ -61,7 +62,12 @@ export default class ChannelPostList extends PureComponent {
 
         this.setState({
             visiblePostIds,
-        });
+            loading: channelSwitch,
+        }, () => InteractionManager.runAfterInteractions(() => {
+            if (channelSwitch) {
+                this.setState({loading: false});
+            }
+        }));
     }
 
     componentDidUpdate(prevProps) {