diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 01badf1ab..994caf8b2 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -2533,14 +2533,17 @@ class ChatController(args: Bundle) :
 
     private fun modifyMessageCount(shouldAddNewMessagesNotice: Boolean, shouldScroll: Boolean) {
         if (!shouldAddNewMessagesNotice && !shouldScroll) {
-            if (!binding?.popupBubbleView?.isShown!!) {
-                newMessagesCount = 1
-                binding?.scrollDownButton?.visibility = View.GONE
-                binding?.popupBubbleView?.show()
-            } else if (binding?.popupBubbleView?.isShown!!) {
-                newMessagesCount++
+            binding?.popupBubbleView?.isShown?.let {
+                if (it) {
+                    newMessagesCount++
+                } else {
+                    newMessagesCount = 1
+                    binding?.scrollDownButton?.visibility = View.GONE
+                    binding?.popupBubbleView?.show()
+                }
             }
         } else {
+            binding?.scrollDownButton?.visibility = View.GONE
             newMessagesCount = 0
         }
     }