diff --git a/apps/setting/ChangeLog b/apps/setting/ChangeLog
index d090add58..942eee11d 100644
--- a/apps/setting/ChangeLog
+++ b/apps/setting/ChangeLog
@@ -68,3 +68,4 @@ of 'Select Clock'
 0.60: Moved LCD calibration to top of menu, and use 12 taps (not 8)
       LCD calibration will now error if the calibration is obviously wrong
 0.61: Permit temporary bypass of the BLE whitelist
+0.62: Fix whitelist showing as 'on' by default when it's not after 0.59
\ No newline at end of file
diff --git a/apps/setting/metadata.json b/apps/setting/metadata.json
index b2b19dd6b..5e0753dd2 100644
--- a/apps/setting/metadata.json
+++ b/apps/setting/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "setting",
   "name": "Settings",
-  "version": "0.61",
+  "version": "0.62",
   "description": "A menu for setting up Bangle.js",
   "icon": "settings.png",
   "tags": "tool,system",
diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index d22f28412..87aaba9d1 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -193,7 +193,7 @@ function showBLEMenu() {
     /*LANG*/'Whitelist': {
       value:
         (
-          settings.whitelist_disabled ? /*LANG*/"off" : /*LANG*/"on"
+          (settings.whitelist_disabled || !settings.whitelist) ? /*LANG*/"off" : /*LANG*/"on"
         ) + (
           settings.whitelist
           ? " (" + settings.whitelist.length + ")"