diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cee5b009c3..c9ce563ec6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -211,8 +211,6 @@
 
         <activity
             android:name=".chat.ChatActivity"
-            android:launchMode="singleInstance"
-            android:noHistory="true"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
 
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 f3d47a718a..2929111918 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -542,7 +542,9 @@ class ChatActivity :
 
         initVoiceRecordButton()
 
-        binding?.messageInputView?.inputEditText?.setText(sharedText)
+        if (sharedText.isNotEmpty()) {
+            binding?.messageInputView?.inputEditText?.setText(sharedText)
+        }
         binding?.messageInputView?.setAttachmentsListener {
             AttachmentDialog(this, this).show()
         }