diff --git a/src/global/actions/api/chats.ts b/src/global/actions/api/chats.ts
index b0ed46bb0..6903d2b1a 100644
--- a/src/global/actions/api/chats.ts
+++ b/src/global/actions/api/chats.ts
@@ -2020,13 +2020,12 @@ export async function fetchChatByUsername<T extends GlobalState>(
 
   global = getGlobal();
   global = updateChat(global, chat.id, chat);
-  setGlobal(global);
-
   if (user) {
     global = updateUser(global, user.id, user);
-    setGlobal(global);
   }
 
+  setGlobal(global);
+
   return chat;
 }