diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0a8abb22..bd1ef180f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -222,6 +222,7 @@
             android:name=".chat.ChatActivity"
             android:theme="@style/AppTheme"
             android:launchMode="singleInstance"
+            android:noHistory="true"
             android:screenOrientation="portrait" />
 
         <activity
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 a0c3bf48a..a22d3cc41 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -579,6 +579,12 @@ class ChatActivity :
         viewThemeUtils.material.themeToolbar(binding.chatToolbar)
     }
 
+    override fun onBackPressed() {
+        val intent = Intent(this, ConversationsListActivity::class.java)
+        intent.putExtras(Bundle())
+        startActivity(intent)
+    }
+
     private fun initAdapter() {
         val senderId = if (!conversationUser!!.userId.equals("?")) {
             "users/" + conversationUser!!.userId