diff --git a/app/init/launch.ts b/app/init/launch.ts
index bb079026de..5805f4f872 100644
--- a/app/init/launch.ts
+++ b/app/init/launch.ts
@@ -6,6 +6,7 @@ import {Alert, DeviceEventEmitter, Linking, Platform} from 'react-native';
 import {Notifications} from 'react-native-notifications';
 
 import {appEntry, pushNotificationEntry, upgradeEntry} from '@actions/remote/entry';
+import LocalConfig from '@assets/config.json';
 import {Screens, DeepLink, Events, Launch, PushNotification} from '@constants';
 import DatabaseManager from '@database/manager';
 import {getActiveServerUrl, getServerCredentials, removeServerCredentials} from '@init/credentials';
@@ -99,8 +100,8 @@ const launchApp = async (props: LaunchProps, resetNavigation = true) => {
                 hasCurrentUser = Boolean(currentUserId);
             }
 
-            // invert this logic
-            if (onboadingViewed) {
+            // invert this logic for onboardingViewed
+            if (LocalConfig.ShowOnboarding && onboadingViewed) {
                 return resetToOnboarding({...props, goToLoginServerUrl: serverUrl});
             }
 
@@ -133,8 +134,8 @@ const launchApp = async (props: LaunchProps, resetNavigation = true) => {
         }
     }
 
-    // invert this logic
-    if (!onboadingViewed) {
+    // invert this logic for onboardingViewed
+    if (LocalConfig.ShowOnboarding && !onboadingViewed) {
         return launchToServer(props, resetNavigation);
     }
     return resetToOnboarding(props);
diff --git a/assets/base/config.json b/assets/base/config.json
index 2212700d52..e1dcc81e6d 100644
--- a/assets/base/config.json
+++ b/assets/base/config.json
@@ -36,5 +36,6 @@
 
     "ShowSentryDebugOptions": false,
 
-    "CustomRequestHeaders": {}
+    "CustomRequestHeaders": {},
+    "ShowOnboarding": false
 }
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 11d85d7748..7a1742c5ed 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -165,6 +165,11 @@ lane :configure do
     json['SentryDsnAndroid'] = ENV['SENTRY_DSN_ANDROID']
   end
 
+  # Configure Show Onboarding
+  if ENV['SHOW_ONBOARDING'] == 'true'
+    json['ShowOnboarding'] = true
+  end
+
   # Save the config.json file
   save_json_as_file('../dist/assets/config.json', json)