diff --git a/Config.h b/Config.h
index d4256384..bcfe9842 100644
--- a/Config.h
+++ b/Config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#define NUKI_HUB_VERSION "8.4"
+#define NUKI_HUB_VERSION "8.5"
 
 #define MQTT_QOS_LEVEL 1
 #define MQTT_CLEAN_SESSIONS false
\ No newline at end of file
diff --git a/NukiWrapper.cpp b/NukiWrapper.cpp
index 13780f89..499d7e93 100644
--- a/NukiWrapper.cpp
+++ b/NukiWrapper.cpp
@@ -60,6 +60,37 @@ void NukiWrapper::initialize(const bool& firstStart)
         _preferences->putInt(preference_command_retry_delay, 1000);
     }
 
+    if(_retryDelay <= 100)
+    {
+        _retryDelay = 100;
+        _preferences->putInt(preference_command_retry_delay, _retryDelay);
+    }
+
+    if(_intervalLockstate == 0)
+    {
+        _intervalLockstate = 60 * 30;
+        _preferences->putInt(preference_query_interval_lockstate, _intervalLockstate);
+    }
+    if(_intervalConfig == 0)
+    {
+        _intervalConfig = 60 * 60;
+        _preferences->putInt(preference_query_interval_configuration, _intervalConfig);
+    }
+    if(_intervalBattery == 0)
+    {
+        _intervalBattery = 60 * 30;
+        _preferences->putInt(preference_query_interval_battery, _intervalBattery);
+    }
+    if(_intervalKeypad == 0)
+    {
+        _intervalKeypad = 60 * 30;
+        _preferences->putInt(preference_query_interval_keypad, _intervalKeypad);
+    }
+    if(_restartBeaconTimeout < 10)
+    {
+        _restartBeaconTimeout = -1;
+        _preferences->putInt(preference_restart_ble_beacon_lost, _restartBeaconTimeout);
+    }
 
     _nukiLock.setEventHandler(this);
 
diff --git a/webflash/nuki_hub.bin b/webflash/nuki_hub.bin
index 6dc2a06b..be67bd10 100644
Binary files a/webflash/nuki_hub.bin and b/webflash/nuki_hub.bin differ