diff --git a/desktop/app/src/dispatcher/metroDevice.tsx b/desktop/app/src/dispatcher/metroDevice.tsx
index dafd3dfae..3a625609f 100644
--- a/desktop/app/src/dispatcher/metroDevice.tsx
+++ b/desktop/app/src/dispatcher/metroDevice.tsx
@@ -38,8 +38,10 @@ async function isMetroRunning(): Promise<boolean> {
             resolve(isMetro);
           });
       })
-      .on('error', (err) => {
-        console.debug('Could not connect to METRO ' + err);
+      .on('error', (err: any) => {
+        if (err.code !== 'ECONNREFUSED') {
+          console.error('Could not connect to METRO ' + err);
+        }
         resolve(false);
       });
   });
diff --git a/desktop/app/src/dispatcher/user.tsx b/desktop/app/src/dispatcher/user.tsx
index 34a79ab13..affa9c7df 100644
--- a/desktop/app/src/dispatcher/user.tsx
+++ b/desktop/app/src/dispatcher/user.tsx
@@ -12,8 +12,13 @@ import {Logger} from '../fb-interfaces/Logger';
 import {login, logout} from '../reducers/user';
 import {getUser, logoutUser} from '../fb-stubs/user';
 import {sideEffect} from '../utils/sideEffect';
+import config from '../fb-stubs/config';
 
 export default (store: Store, _logger: Logger) => {
+  if (!config.isFBBuild) {
+    return;
+  }
+
   getUser()
     .then((user) => {
       store.dispatch(login(user));