diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0427bc7ce1..75e58dca71 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -29,7 +29,8 @@
         android:name=".MainActivity"
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+        android:launchMode="singleTask">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/mattermost.js b/app/mattermost.js
index c82c1b36d2..8e54c4232d 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -58,6 +58,10 @@ const launchApp = (credentials) => {
 
     telemetry.startSinceLaunch(['start:splash_screen']);
     EphemeralStore.appStarted = true;
+
+    Linking.getInitialURL().then((url) => {
+        store.dispatch(setDeepLinkURL(url));
+    });
 };
 
 const launchAppAndAuthenticateIfNeeded = async (credentials) => {
@@ -73,10 +77,6 @@ const launchAppAndAuthenticateIfNeeded = async (credentials) => {
             await emmProvider.handleAuthentication(store);
         }
     }
-
-    Linking.getInitialURL().then((url) => {
-        store.dispatch(setDeepLinkURL(url));
-    });
 };
 
 Navigation.events().registerAppLaunchedListener(() => {