diff --git a/app/components/sidebars/main/channels_list/list/index.js b/app/components/sidebars/main/channels_list/list/index.js
index f0ab2030a..0a9eabe09 100644
--- a/app/components/sidebars/main/channels_list/list/index.js
+++ b/app/components/sidebars/main/channels_list/list/index.js
@@ -46,7 +46,7 @@ function mapStateToProps(state) {
         sidebarPrefs.grouping,
         sidebarPrefs.sorting,
         sidebarPrefs.unreads_at_top === 'true',
-        sidebarPrefs.favorite_at_top === 'true',
+        sidebarPrefs.favorite_at_top === 'true' && favoriteChannelIds.length,
     ));
 
     return {