diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 69f1675c1..134c01713 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"
+        android:launchMode="singleTask"
         android:label="@string/app_name"
         android:screenOrientation="portrait"
         android:configChanges="keyboard|keyboardHidden|screenSize"
@@ -26,8 +27,8 @@
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="esteem" android:host="esteem" />
-            <data android:scheme="steemit" android:host="steemit" />
+            <data android:scheme="esteem" />
+            <data android:scheme="steemit" />
         </intent-filter>
       </activity>
       <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
diff --git a/src/screens/root/container/rootContainer.js b/src/screens/root/container/rootContainer.js
index 63854d48a..eaf771322 100644
--- a/src/screens/root/container/rootContainer.js
+++ b/src/screens/root/container/rootContainer.js
@@ -33,14 +33,7 @@ const RootContainer = () => (WrappedComponent) => {
     componentDidMount() {
       AppState.addEventListener('change', this._handleAppStateChange);
       this._createPushListener();
-
-      if (Platform.OS === 'android') {
-        Linking.getInitialURL().then((url) => {
-          this._handleDeepLink(url);
-        });
-      } else {
-        Linking.addEventListener('url', this._handleOpenURL);
-      }
+      Linking.addEventListener('url', this._handleOpenURL);
     }
 
     componentWillUnmount() {