diff --git a/apps.json b/apps.json
index 660de544a..bf6a1b637 100644
--- a/apps.json
+++ b/apps.json
@@ -4,7 +4,7 @@
     "tags": "tool,system",
     "type":"bootloader",
     "icon": "bootloader.png",
-    "version":"0.21",
+    "version":"0.22",
     "description": "This is needed by Bangle.js to automatically load the clock, menu, widgets and settings",
     "storage": [
       {"name":".boot0","url":"boot0.js"},
diff --git a/apps/boot/ChangeLog b/apps/boot/ChangeLog
index d2f68fd0e..7e9fd4a81 100644
--- a/apps/boot/ChangeLog
+++ b/apps/boot/ChangeLog
@@ -20,3 +20,4 @@
 0.19: Tweaks to simplify code and lower memory usage
 0.20: Allow Gadgetbridge to work even with programmable:off
 0.21: Handle echo off char from Gadgetbridge app when programmable:off (fix #558)
+0.22: Stop LCD timeout being disabled on first run (when there is no settings.json)
diff --git a/apps/boot/boot0.js b/apps/boot/boot0.js
index 630252dea..550513b11 100644
--- a/apps/boot/boot0.js
+++ b/apps/boot/boot0.js
@@ -50,7 +50,7 @@ if (!Bangle.F_BEEPSET) {
     });
   };
 }
-Bangle.setLCDTimeout(s.timeout);
+if (s.timeout!==undefined) Bangle.setLCDTimeout(s.timeout);
 if (!s.timeout) Bangle.setLCDPower(1);
 E.setTimeZone(s.timezone);
 delete s;