diff --git a/app/components/channel_drawer/channel_drawer.js b/app/components/channel_drawer/channel_drawer.js
index 6695d64bd..b2c71c2a5 100644
--- a/app/components/channel_drawer/channel_drawer.js
+++ b/app/components/channel_drawer/channel_drawer.js
@@ -316,25 +316,23 @@ export default class ChannelDrawer extends PureComponent {
         } = this.state;
 
         const showTeams = openDrawerOffset !== 0 && teamsCount > 1;
-
-        let teams;
-        if (showTeams) {
-            teams = (
-                <View style={style.swiperContent}>
-                    <TeamsList
-                        closeChannelDrawer={this.closeChannelDrawer}
-                        navigator={navigator}
-                    />
-                </View>
-            );
-
-            if (this.drawerSwiper) {
+        if (this.drawerSwiper) {
+            if (showTeams) {
                 this.drawerSwiper.getWrappedInstance().runOnLayout();
+            } else if (!openDrawerOffset) {
+                this.drawerSwiper.getWrappedInstance().scrollToStart();
             }
-        } else if (this.drawerSwiper && !openDrawerOffset) {
-            this.drawerSwiper.getWrappedInstance().scrollToStart();
         }
 
+        const teamsList = (
+            <View style={style.swiperContent}>
+                <TeamsList
+                    closeChannelDrawer={this.closeChannelDrawer}
+                    navigator={navigator}
+                />
+            </View>
+        );
+
         const channelsList = (
             <View style={style.swiperContent}>
                 <ChannelsList
@@ -356,7 +354,7 @@ export default class ChannelDrawer extends PureComponent {
                 showTeams={showTeams}
                 theme={theme}
             >
-                {teams}
+                {teamsList}
                 {channelsList}
             </DrawerSwiper>
         );