diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
index aa0f6c4085..bd87d253de 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt
@@ -326,6 +326,7 @@ fun ComposeView(
               mc = updateMsgContent(oldMsgContent)
             )
             if (updatedItem != null) chatModel.upsertChatItem(cInfo, updatedItem.chatItem)
+            clearState()
           }
         }
       }
@@ -369,11 +370,13 @@ fun ComposeView(
               mc = mc
             )
             if (aChatItem != null) chatModel.addChatItem(cInfo, aChatItem.chatItem)
+            clearState()
           }
+        } else {
+          clearState()
         }
       }
     }
-    clearState()
   }
 
   fun onMessageChange(s: String) {