diff --git a/main/ZactuatorONOFF.ino b/main/ZactuatorONOFF.ino
index c834a75..c92bd7f 100644
--- a/main/ZactuatorONOFF.ino
+++ b/main/ZactuatorONOFF.ino
@@ -51,6 +51,9 @@ void ONOFFConfig_fromJson(JsonObject& ONOFFdata) {
       preferences.end();
       Log.notice(F("ONOFF config erased" CR));
       return; // Erase prevails on save, so skipping save
+    } else {
+      Log.notice(F("ONOFF config not found" CR));
+      preferences.end();
     }
   }
   if (ONOFFdata.containsKey("save") && ONOFFdata["save"].as<bool>()) {
@@ -85,6 +88,9 @@ void ONOFFConfig_load() {
     JsonObject jo = jsonBuffer.as<JsonObject>();
     ONOFFConfig_fromJson(jo);
     Log.notice(F("ONOFF config loaded" CR));
+  } else {
+    preferences.end();
+    Log.notice(F("ONOFF config not found" CR));
   }
 }
 #  else
diff --git a/main/ZdisplaySSD1306.ino b/main/ZdisplaySSD1306.ino
index 02d612b..d45a176 100644
--- a/main/ZdisplaySSD1306.ino
+++ b/main/ZdisplaySSD1306.ino
@@ -179,8 +179,8 @@ void MQTTtoSSD1306(char* topicOri, JsonObject& SSD1306data) { // json object dec
       preferences.begin(Gateway_Short_Name, false);
       if (preferences.isKey("SSD1306Config")) {
         success = preferences.remove("SSD1306Config");
-        preferences.end();
       }
+      preferences.end();
       if (success) {
         Log.notice(F("SSD1306 config erased" CR));
       }
diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino
index 8d21e32..394e7f9 100644
--- a/main/ZgatewayBT.ino
+++ b/main/ZgatewayBT.ino
@@ -256,6 +256,9 @@ void BTConfig_fromJson(JsonObject& BTdata, bool startup = false) {
       preferences.end();
       Log.notice(F("BT config erased" CR));
       return; // Erase prevails on save, so skipping save
+    } else {
+      preferences.end();
+      Log.notice(F("BT config not found" CR));
     }
   }
 
@@ -310,6 +313,9 @@ void BTConfig_load() {
     JsonObject jo = jsonBuffer.as<JsonObject>();
     BTConfig_fromJson(jo, true); // Never send MQTT message with config
     Log.notice(F("BT config loaded" CR));
+  } else {
+    preferences.end();
+    Log.notice(F("BT config not found" CR));
   }
 }