diff --git a/android/feature/chat/src/main/java/io/picoclaw/android/feature/chat/screen/ChatScreen.kt b/android/feature/chat/src/main/java/io/picoclaw/android/feature/chat/screen/ChatScreen.kt
index 7cb48a7d6..f8e9206be 100644
--- a/android/feature/chat/src/main/java/io/picoclaw/android/feature/chat/screen/ChatScreen.kt
+++ b/android/feature/chat/src/main/java/io/picoclaw/android/feature/chat/screen/ChatScreen.kt
@@ -146,7 +146,7 @@ fun ChatScreen(
         derivedStateOf { listState.firstVisibleItemIndex <= 3 }
     }
 
-    LaunchedEffect(uiState.messages.size) {
+    LaunchedEffect(uiState.messages.firstOrNull()?.id) {
         if (isNearBottom) {
             listState.animateScrollToItem(0)
         }