diff --git a/factory_settings.ini b/factory_settings.ini
index 4b4337c1c..92058a03b 100644
--- a/factory_settings.ini
+++ b/factory_settings.ini
@@ -38,8 +38,8 @@ build_flags =
     -D FACTORY_MQTT_PASSWORD=\"\"
     ; if unspecified the devices hardware ID will be used
     -D FACTORY_MQTT_CLIENT_ID=\"ems-esp\"
-    -D FACTORY_MQTT_KEEP_ALIVE=16
-    -D FACTORY_MQTT_CLEAN_SESSION=true
+    -D FACTORY_MQTT_KEEP_ALIVE=60
+    -D FACTORY_MQTT_CLEAN_SESSION=false
     -D FACTORY_MQTT_MAX_TOPIC_LENGTH=128
 
     ; JWT Secret