diff --git a/sphinx/screens/chats/chat-common/chat-common/src/main/java/chat/sphinx/chat_common/ui/ChatViewModel.kt b/sphinx/screens/chats/chat-common/chat-common/src/main/java/chat/sphinx/chat_common/ui/ChatViewModel.kt
index 5516fc33f9..792bfefca8 100644
--- a/sphinx/screens/chats/chat-common/chat-common/src/main/java/chat/sphinx/chat_common/ui/ChatViewModel.kt
+++ b/sphinx/screens/chats/chat-common/chat-common/src/main/java/chat/sphinx/chat_common/ui/ChatViewModel.kt
@@ -991,6 +991,10 @@ abstract class ChatViewModel<ARGS : NavArgs>(
             return
         }
 
+        if (chatId == null) {
+            shimmerViewState.updateViewState(ShimmerViewState.Off)
+        }
+
         var isScrollDownButtonSetup = false
         messagesLoadJob = viewModelScope.launch(mainImmediate) {
             if (isThreadChat()) {