diff --git a/app/initial_state.js b/app/initial_state.js
index 9e57b2905..d33e30f73 100644
--- a/app/initial_state.js
+++ b/app/initial_state.js
@@ -253,8 +253,7 @@ const state = {
     views: {
         channel: {
             drafts: {},
-            loading: false,
-            tooltipVisible: false
+            loading: false
         },
         fetchCache: {},
         i18n: {
diff --git a/app/mattermost.js b/app/mattermost.js
index 3adbb7eb3..9a2c5e2ac 100644
--- a/app/mattermost.js
+++ b/app/mattermost.js
@@ -397,10 +397,14 @@ export default class Mattermost {
             if (Platform.OS === 'android') {
                 // In case of Android we need to handle the bridge being initialized by HeadlessJS
                 Promise.resolve(Navigation.isAppLaunched()).then((appLaunched) => {
-                    if (appLaunched) {
-                        this.launchApp(); // App is launched -> show UI
+                    if (notification) {
+                        if (appLaunched) {
+                            this.launchApp(); // App is launched -> show UI
+                        } else {
+                            new NativeEventsReceiver().appLaunched(this.launchApp); // App hasn't been launched yet -> show the UI only when needed.
+                        }
                     } else {
-                        new NativeEventsReceiver().appLaunched(this.launchApp); // App hasn't been launched yet -> show the UI only when needed.
+                        this.launchApp();
                     }
                 });
             } else if (AppState.currentState === 'background') {