diff --git a/apps/settings-default.json b/apps/settings-default.json
index 9f73f1e7c..58ec43244 100644
--- a/apps/settings-default.json
+++ b/apps/settings-default.json
@@ -1,5 +1,6 @@
 {
   ble: false,          // Bluetooth disabled by default
+  dev: false,          // Espruino IDE disabled by default
   timeout: 10,         // Default LCD timeout in seconds
   vibrate: true,       // Vibration enabled by default. App must support
   beep: true,          // Beep enabled by default. App must support
diff --git a/apps/settings-init.js b/apps/settings-init.js
index 16079801f..38ced8feb 100644
--- a/apps/settings-init.js
+++ b/apps/settings-init.js
@@ -1,7 +1,7 @@
 (function() {
   var s = require('Storage').readJSON('@setting');
   if (s.ble) {
-    var adv = { uart: true };
+    var adv = { uart: s.dev };
     if (s.HID) {
       // Report from https://notes.iopush.net/custom-usb-hid-device-descriptor-media-keyboard/
       Bangle.HID = new Uint8Array([
@@ -75,7 +75,7 @@
       ]);
       adv.hid = Bangle.HID;
     }
-    NRF.setServices(undefined, adv);
+    NRF.setServices({}, adv);
     try {
       NRF.wake();
     } catch (e) {}
diff --git a/apps/settings.js b/apps/settings.js
index 6a11eab55..f8e2d493f 100644
--- a/apps/settings.js
+++ b/apps/settings.js
@@ -19,6 +19,7 @@ function updateSettings() {
 function resetSettings() {
   settings = {
     ble: false,
+    dev: false,
     timeout: 10,
     vibrate: true,
     beep: true,
@@ -48,6 +49,14 @@ function showMainMenu() {
         updateSettings();
       }
     },
+    'Dev': {
+      value: settings.dev,
+      format: bootFormat,
+      onchange: () => {
+        settings.dev = !settings.dev;
+        updateSettings();
+      }
+    },
     'LCD Timeout': {
       value: settings.timeout,
       min: 0,