diff --git a/app/components/channel_list/categories/body/category_body.tsx b/app/components/channel_list/categories/body/category_body.tsx
index 38f3787a9..017475a9c 100644
--- a/app/components/channel_list/categories/body/category_body.tsx
+++ b/app/components/channel_list/categories/body/category_body.tsx
@@ -33,7 +33,7 @@ const CategoryBody = ({currentChannelId, sortedIds, category, limit}: Props) =>
                 collapsed={category.collapsed}
             />
         );
-    }, [currentChannelId]);
+    }, [currentChannelId, category.collapsed]);
 
     return (
         <FlatList
diff --git a/app/screens/home/channel_list/channel_list.tsx b/app/screens/home/channel_list/channel_list.tsx
index 62cc76a71..1670df871 100644
--- a/app/screens/home/channel_list/channel_list.tsx
+++ b/app/screens/home/channel_list/channel_list.tsx
@@ -94,6 +94,7 @@ const ChannelListScreen = (props: ChannelProps) => {
                         teamsCount={props.teamsCount}
                     />
                     <ChannelList
+                        key={props.currentTeamId}
                         iconPad={canAddOtherServers && props.teamsCount <= 1}
                         isTablet={isTablet}
                         teamsCount={props.teamsCount}