diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
index 96e7c08f..e497e085 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatViewModel.kt
@@ -79,6 +79,15 @@ class ChatViewModel(
                 handleWsEvent(event)
             }
         }
+
+        if (wsClient.isConnected) {
+            _uiState.update { it.copy(isConnected = true, isLoading = false) }
+            addSystemMessage("Connected to Hermes")
+            loadSessions()
+            if (_uiState.value.currentSessionId == null) {
+                createNewSession()
+            }
+        }
     }
 
     private fun handleWsEvent(event: WsEvent) {