diff --git a/scripts/start-dev-server.js b/scripts/start-dev-server.js
index 0c084bad8..f7898ee63 100644
--- a/scripts/start-dev-server.js
+++ b/scripts/start-dev-server.js
@@ -26,6 +26,7 @@ function launchElectron({bundleURL, electronURL}) {
   const args = [
     path.join(STATIC_DIR, 'index.js'),
     '--remote-debugging-port=9222',
+    ...process.argv,
   ];
 
   const proc = child.spawn(electronBinary, args, {
diff --git a/src/__tests__/__snapshots__/App.electron.js.snap b/src/__tests__/__snapshots__/App.electron.js.snap
index acf2059ca..e7774dc23 100644
--- a/src/__tests__/__snapshots__/App.electron.js.snap
+++ b/src/__tests__/__snapshots__/App.electron.js.snap
@@ -58,9 +58,6 @@ exports[`Empty app state matches snapshot 1`] = `
     <div
       className="css-12zzrdt"
     />
-    <div
-      className="css-1xcv92o"
-    />
     <div
       className="css-1cecbfb"
       onClick={[Function]}
diff --git a/src/chrome/TitleBar.js b/src/chrome/TitleBar.js
index dc2dc1eca..6ee52560c 100644
--- a/src/chrome/TitleBar.js
+++ b/src/chrome/TitleBar.js
@@ -27,6 +27,7 @@ import DevicesButton from './DevicesButton.js';
 import ScreenCaptureButtons from './ScreenCaptureButtons.js';
 import AutoUpdateVersion from './AutoUpdateVersion.js';
 import config from '../fb-stubs/config.js';
+import {isAutoUpdaterEnabled} from '../utils/argvUtils.js';
 
 const AppTitleBar = styled(FlexRow)(({focused}) => ({
   background: focused
@@ -65,7 +66,7 @@ class TitleBar extends Component<Props> {
         <DevicesButton />
         <ScreenCaptureButtons />
         <Spacer />
-        {process.platform === 'darwin' ? <AutoUpdateVersion /> : null}
+        {isAutoUpdaterEnabled() ? <AutoUpdateVersion /> : null}
         {config.bugReportButtonVisible && (
           <Button
             compact={true}
diff --git a/src/utils/__mocks__/argvUtils.js b/src/utils/__mocks__/argvUtils.js
new file mode 100644
index 000000000..088120de2
--- /dev/null
+++ b/src/utils/__mocks__/argvUtils.js
@@ -0,0 +1,8 @@
+/**
+ * Copyright 2018-present Facebook.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * @format
+ */
+
+export const isAutoUpdaterEnabled = false;
diff --git a/src/utils/argvUtils.js b/src/utils/argvUtils.js
new file mode 100644
index 000000000..fab9de54f
--- /dev/null
+++ b/src/utils/argvUtils.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright 2018-present Facebook.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ * @format
+ */
+
+import electron from 'electron';
+import isProduction from './isProduction';
+
+export const isAutoUpdaterEnabled = () =>
+  // $FlowFixMe: argv is not included in the type defs.
+  !electron.remote.process.argv.includes('--no-updater') &&
+  isProduction() &&
+  process.platform === 'darwin';