diff --git a/src/HomeAssistantHelper.h b/src/HomeAssistantHelper.h
index bcff04f..8cf353f 100644
--- a/src/HomeAssistantHelper.h
+++ b/src/HomeAssistantHelper.h
@@ -382,7 +382,7 @@ public:
     doc[F("command_topic")] = _prefix + F("/settings/set");
     doc[F("command_template")] = F("{\"heating\": {\"target\" : {{ value }}}}");
     doc[F("min")] = minTemp;
-    doc[F("max")] = maxTemp <= minTemp ? maxTemp : maxTemp;
+    doc[F("max")] = maxTemp;
     doc[F("step")] = 0.5;
     doc[F("mode")] = "box";
 
diff --git a/src/Settings.h b/src/Settings.h
index e88c503..6f3f777 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -107,11 +107,11 @@ struct Variables {
 
   struct {
     bool heatingEnabled = false;
-    byte heatingMinTemp = 0;
-    byte heatingMaxTemp = 0;
+    byte heatingMinTemp = 20;
+    byte heatingMaxTemp = 90;
     byte heatingSetpoint = 0.0f;
-    byte dhwMinTemp = 0;
-    byte dhwMaxTemp = 0;
+    byte dhwMinTemp = 30;
+    byte dhwMaxTemp = 60;
     uint8_t slaveMemberIdCode;
     uint8_t slaveType;
     uint8_t slaveVersion;