diff --git a/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js b/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
index 24de66f5..035fd08c 100644
--- a/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
+++ b/app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js
@@ -7,8 +7,12 @@ if (window.Storage){
     }).bind(Storage.prototype.setItem);
 
     Storage.prototype.getItem = (function(key) {
-        //GBjs.gbLog("I am about to return " + prefix + key);
-        return this.call(localStorage,prefix + key);
+//        console.log("I am about to return " + prefix + key);
+        var def = null;
+        if(key == 'clay-settings') {
+            def = '{}';
+        }
+        return this.call(localStorage,prefix + key) || def;
     }).bind(Storage.prototype.getItem);
 }