diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index 944eae8a9..e4adb432a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -543,7 +543,7 @@ class ConversationInfoController(args: Bundle) :
                         .java
                 ).setInputData(it).build()
             )
-            popTwoLastControllers()
+            router.popToRoot()
         }
     }
 
@@ -613,16 +613,10 @@ class ConversationInfoController(args: Bundle) :
                     DeleteConversationWorker::class.java
                 ).setInputData(it).build()
             )
-            popTwoLastControllers()
+            router.popToRoot()
         }
     }
 
-    private fun popTwoLastControllers() {
-        var backstack = router.backstack
-        backstack = backstack.subList(0, backstack.size - 2)
-        router.setBackstack(backstack, HorizontalChangeHandler())
-    }
-
     private fun fetchRoomInfo() {
         var apiVersion = 1
         // FIXME Fix API checking with guests?