diff --git a/app/src/Server.js b/app/src/Server.js
index 43689b42..a91ffc3a 100644
--- a/app/src/Server.js
+++ b/app/src/Server.js
@@ -880,7 +880,7 @@ function startServer() {
             'font-family:monospace',
         );
 
-        if (config.ngrok.authToken !== '') {
+        if (config.ngrok.enabled && config.ngrok.authToken !== '') {
             return ngrokStart();
         }
         log.info('Server config', getServerConfig());
diff --git a/app/src/config.template.js b/app/src/config.template.js
index ff148f9a..64d2221e 100644
--- a/app/src/config.template.js
+++ b/app/src/config.template.js
@@ -190,6 +190,7 @@ module.exports = {
             2. Get started for free 
             3. Copy YourNgrokAuthToken: https://dashboard.ngrok.com/get-started/your-authtoken
         */
+        enabled: false,
         authToken: '',
     },
     sentry: {