diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 2ba54997b3fa822eaa8cad09a5a358d35119d9d2..320e7aad33ca625f3f9d3741130c33114af1284d 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -4641,16 +4641,14 @@ public class ConversationFragment extends XmppFragment
                 && conversation.setOutgoingChatState(Config.DEFAULT_CHAT_STATE)) {
             service.sendChatState(conversation);
         }
-        if (storeNextMessage()) {
-            runOnUiThread(
-                    () -> {
-                        if (activity == null) {
-                            return;
-                        }
+        final boolean stored = storeNextMessage(null);
+        runOnUiThread(
+                () -> {
+                    if (stored && activity != null) {
                         activity.onConversationsListItemUpdated();
-                    });
-        }
-        runOnUiThread(this::updateSendButton);
+                    }
+                    updateSendButton();
+                });
     }
 
     @Override