diff --git a/lib/gui/app/modules/drive-scanner.js b/lib/gui/app/modules/drive-scanner.js
index e6f7c497..c96bdd48 100644
--- a/lib/gui/app/modules/drive-scanner.js
+++ b/lib/gui/app/modules/drive-scanner.js
@@ -23,7 +23,7 @@ const permissions = require('../../../shared/permissions')
 const scanner = SDK.createScanner({
   blockdevice: {
     get includeSystemDrives () {
-      return settings.get('unsafeMode')
+      return settings.get('unsafeMode') && !process.env.ETCHER_HIDE_UNSAFE_MODE
     }
   },
   usbboot: {}
diff --git a/lib/gui/app/pages/main/controllers/drive-selection.js b/lib/gui/app/pages/main/controllers/drive-selection.js
index 97abced3..318f055f 100644
--- a/lib/gui/app/pages/main/controllers/drive-selection.js
+++ b/lib/gui/app/pages/main/controllers/drive-selection.js
@@ -109,7 +109,7 @@ module.exports = function (DriveSelectorService) {
 
       analytics.logEvent('Select drive', {
         device: drive.device,
-        unsafeMode: settings.get('unsafeMode')
+        unsafeMode: settings.get('unsafeMode') && !process.env.ETCHER_HIDE_UNSAFE_MODE
       })
     }).catch(exceptionReporter.report)
   }
diff --git a/lib/gui/app/pages/settings/controllers/settings.js b/lib/gui/app/pages/settings/controllers/settings.js
index 97ada2da..be56f1b6 100644
--- a/lib/gui/app/pages/settings/controllers/settings.js
+++ b/lib/gui/app/pages/settings/controllers/settings.js
@@ -104,4 +104,18 @@ module.exports = function (WarningModalService) {
       }
     }).catch(exceptionReporter.report)
   }
+
+  /**
+   * @summary Show unsafe mode based on an env var
+   * @function
+   * @public
+   *
+   * @returns {Boolean}
+   *
+   * @example
+   * SettingsController.shouldShowUnsafeMode()
+   */
+  this.shouldShowUnsafeMode = () => {
+    return !process.env.ETCHER_HIDE_UNSAFE_MODE
+  }
 }
diff --git a/lib/gui/app/pages/settings/templates/settings.tpl.html b/lib/gui/app/pages/settings/templates/settings.tpl.html
index b6b095c8..66494d4c 100644
--- a/lib/gui/app/pages/settings/templates/settings.tpl.html
+++ b/lib/gui/app/pages/settings/templates/settings.tpl.html
@@ -54,7 +54,7 @@
     </label>
   </div>
 
-  <div class="checkbox">
+  <div class="checkbox" ng-if="settings.shouldShowUnsafeMode()">
     <label>
       <input type="checkbox"
         tabindex="10"