diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
index ec2e75fb4..dc2d37e3f 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
@@ -311,7 +311,13 @@ public class ChatController extends BaseController implements MessagesListAdapte
 
         popupBubble.setPopupBubbleListener(context -> {
             if (newMessagesCount != 0) {
-                new Handler().postDelayed(() -> messagesList.smoothScrollToPosition(newMessagesCount - 1), 200);
+                int scrollPosition;
+                if (newMessagesCount - 1 < 0) {
+                    scrollPosition = 0;
+                } else {
+                    scrollPosition = newMessagesCount - 1;
+                }
+                new Handler().postDelayed(() -> messagesList.smoothScrollToPosition(scrollPosition), 200);
             }
         });