diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 60a0d1089..83cb5ad5b 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -2523,7 +2523,16 @@ class ChatActivity :
         addMessagesToAdapter(shouldAddNewMessagesNotice, chatMessageList)
 
         if (shouldAddNewMessagesNotice && adapter != null) {
-            layoutManager?.scrollToPosition(0)
+            scrollToFirstUnreadMessage()
+        }
+    }
+
+    private fun scrollToFirstUnreadMessage() {
+        adapter?.let {
+            layoutManager?.scrollToPositionWithOffset(
+                it.getMessagePositionByIdInReverse("-1"),
+                binding.messagesListView.height / 2
+            )
         }
     }