diff --git a/src/defines.h b/src/defines.h
index f43ea4d..f5e0de9 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -16,7 +16,7 @@
 
 #define THERMOSTAT_INDOOR_DEFAULT_TEMP  20
 #define THERMOSTAT_INDOOR_MIN_TEMP      5
-#define THERMOSTAT_INDOOR_MAX_TEMP      30
+#define THERMOSTAT_INDOOR_MAX_TEMP      40
 
 #define DEFAULT_NTC_NOMINAL_RESISTANCE  10000.0f
 #define DEFAULT_NTC_NOMINAL_TEMP        25.0f
diff --git a/src_data/pages/settings.html b/src_data/pages/settings.html
index 4452297..453a894 100644
--- a/src_data/pages/settings.html
+++ b/src_data/pages/settings.html
@@ -869,7 +869,7 @@
           if (data.opentherm.options.nativeHeatingControl) {
             setInputValue("[name='emergency[target]']", data.emergency.target, {
               "min": data.system.unitSystem == 0 ? 5 : 41,
-              "max": data.system.unitSystem == 0 ? 30 : 86
+              "max": data.system.unitSystem == 0 ? 40 : 86
             });
 
           } else {