diff --git a/app/actions/remote/systems.ts b/app/actions/remote/systems.ts
index d8525f2e4f..fbfbf1b52e 100644
--- a/app/actions/remote/systems.ts
+++ b/app/actions/remote/systems.ts
@@ -63,7 +63,7 @@ export const fetchConfigAndLicense = async (serverUrl: string, fetchOnly = false
         ]);
 
         if (!fetchOnly) {
-            storeConfigAndLicense(serverUrl, config, license);
+            await storeConfigAndLicense(serverUrl, config, license);
         }
 
         return {config, license};
diff --git a/app/screens/home/channel_list/categories_list/categories/body/category_body.tsx b/app/screens/home/channel_list/categories_list/categories/body/category_body.tsx
index 7a98a3822e..faab95a360 100644
--- a/app/screens/home/channel_list/categories_list/categories/body/category_body.tsx
+++ b/app/screens/home/channel_list/categories_list/categories/body/category_body.tsx
@@ -62,7 +62,9 @@ const CategoryBody = ({sortedChannels, unreadIds, unreadsOnTop, category, limit,
     }, [category.collapsed]);
 
     useEffect(() => {
-        fetchDirectChannelsInfo(serverUrl, directChannels);
+        if (directChannels.length) {
+            fetchDirectChannelsInfo(serverUrl, directChannels);
+        }
     }, [directChannels.length]);
 
     const height = ids.length ? ids.length * 40 : 0;