diff --git a/app/components/channel_drawer/channels_list/index.js b/app/components/channel_drawer/channels_list/index.js
index 0b9c75491..b3cb9e2cb 100644
--- a/app/components/channel_drawer/channels_list/index.js
+++ b/app/components/channel_drawer/channels_list/index.js
@@ -123,6 +123,7 @@ class ChannelsList extends Component {
 
         const {searching, term} = this.state;
         const teamMembers = Object.values(myTeamMembers);
+        const showMembers = teamMembers.length > 1;
         const styles = getStyleSheet(theme);
 
         let settings;
@@ -176,7 +177,7 @@ class ChannelsList extends Component {
 
         let badge;
         let switcher;
-        if (teamMembers.length > 1 && !searching) {
+        if (showMembers && !searching) {
             let mentionCount = 0;
             let messageCount = 0;
             teamMembers.forEach((m) => {
@@ -227,7 +228,7 @@ class ChannelsList extends Component {
 
         return (
             <View
-                style={[styles.container, styles.extraPadding]}
+                style={[styles.container, showMembers ? styles.extraPadding : {}]}
             >
                 <View style={styles.statusBar}>
                     <View style={styles.headerContainer}>
diff --git a/app/components/channel_drawer/swiper/swiper.ios.js b/app/components/channel_drawer/swiper/swiper.ios.js
index d1566e7f8..1bfc6f967 100644
--- a/app/components/channel_drawer/swiper/swiper.ios.js
+++ b/app/components/channel_drawer/swiper/swiper.ios.js
@@ -44,6 +44,11 @@ export default class SwiperIos extends PureComponent {
             theme
         } = this.props;
 
+        const pagination = {bottom: 0};
+        if (showTeams) {
+            pagination.bottom = 10;
+        }
+
         return (
             <Swiper
                 ref='swiper'
@@ -51,7 +56,7 @@ export default class SwiperIos extends PureComponent {
                 loop={false}
                 index={1}
                 onMomentumScrollEnd={this.swiperPageSelected}
-                paginationStyle={{position: 'relative', bottom: 10}}
+                paginationStyle={[{position: 'relative'}, pagination]}
                 width={deviceWidth - openDrawerOffset}
                 height={deviceHeight}
                 style={{backgroundColor: theme.sidebarBg}}