diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
index 770a63a3fa..e041741ffe 100644
--- a/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorBaseActivity.kt
@@ -188,7 +188,8 @@ abstract class VectorBaseActivity : AppCompatActivity(), HasScreenInjector {
             if (!it.hasBeenHandled) {
                 // Recreate the Activity because configuration has changed
                 startActivity(intent)
-                finish()
+                //finish()
+                Runtime.getRuntime().exit(0)
             }
         })