diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 11fbb352c..81814b1c6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,6 +82,7 @@
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/nc_app_label"
+            android:launchMode="singleTask"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index ead1a14cc..b5094d254 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -86,7 +86,6 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                         )
 
                         onNewIntent(intent)
-
                     }
                 } else {
                     runOnUiThread {
@@ -97,10 +96,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                         )
                     }
                 }
-
             }
-        } else {
-            onNewIntent(intent)
         }
     }
 
@@ -143,7 +139,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
                     extras.putParcelable(BundleKeys.KEY_USER_ENTITY, it)
                     withContext(Dispatchers.Main) {
                         ConductorRemapping.remapChatController(
-                                router!!, intent.getLongExtra(BundleKeys.KEY_INTERNAL_USER_ID, -1),
+                                router!!, it.id!!,
                                 intent.getStringExtra(BundleKeys.KEY_ROOM_TOKEN)!!, extras, false)
                     }
                 }
diff --git a/app/src/main/java/com/nextcloud/talk/newarch/utils/GlobalService.kt b/app/src/main/java/com/nextcloud/talk/newarch/utils/GlobalService.kt
index 0c284f185..73acebdbf 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/utils/GlobalService.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/utils/GlobalService.kt
@@ -50,10 +50,12 @@ class GlobalService constructor(usersRepository: UsersRepository,
 
     init {
         currentUserLiveData.observeForever { user ->
-            if (user.id != previousUser?.id) {
-                cookieManager.cookieStore.removeAll()
-                //okHttpClient.dispatcher().cancelAll()
-                currentConversation = null
+            user?.let {
+                if (it.id != previousUser?.id) {
+                    cookieManager.cookieStore.removeAll()
+                    //okHttpClient.dispatcher().cancelAll()
+                    currentConversation = null
+                }
             }
         }
     }