diff --git a/genericheatingcooling/integrationplugingenericheatingcooling.cpp b/genericheatingcooling/integrationplugingenericheatingcooling.cpp
index 3b5d15d..c3f74b5 100644
--- a/genericheatingcooling/integrationplugingenericheatingcooling.cpp
+++ b/genericheatingcooling/integrationplugingenericheatingcooling.cpp
@@ -191,6 +191,10 @@ void IntegrationPluginGenericHeatingCooling::executeAction(ThingActionInfo *info
 
 void IntegrationPluginGenericHeatingCooling::thermostatCheckPowerOutputState(Thing *thing)
 {
+    bool autoControl = thing->setting(thermostatSettingsAutoControlParamTypeId).toBool();
+    if (!autoControl) {
+        return;
+    }
     double targetTemperature = thing->stateValue(thermostatTargetTemperatureStateTypeId).toDouble();
     double actualTemperature = thing->stateValue(thermostatTemperatureStateTypeId).toDouble();
     double temperatureDifference = thing->setting(thermostatSettingsTemperatureDifferenceParamTypeId).toDouble();
diff --git a/genericheatingcooling/integrationplugingenericheatingcooling.json b/genericheatingcooling/integrationplugingenericheatingcooling.json
index 03e8f9f..5238f59 100644
--- a/genericheatingcooling/integrationplugingenericheatingcooling.json
+++ b/genericheatingcooling/integrationplugingenericheatingcooling.json
@@ -89,15 +89,6 @@
                     "createMethods": ["user"],
                     "interfaces": ["thermostat"],
                     "settingsTypes": [
-                        {
-                            "id": "64bf308f-a543-4e02-b787-1a1714c1f978",
-                            "name": "temperatureDifference",
-                            "displayName": "Temperature difference",
-                            "type": "double",
-                            "unit": "DegreeCelsius",
-                            "minValue": 0.00,
-                            "defaultValue": 2.00
-                        },
                         {
                             "id": "67451c97-50e1-4ea6-ac43-4386fbd26698",
                             "name": "minTargetTemperature",
@@ -117,6 +108,22 @@
                             "minValue": -99,
                             "maxValue": 100,
                             "defaultValue": 50
+                        },
+                        {
+                            "id": "d14676ba-6f7d-439f-ac67-3e91788c9ed1",
+                            "name": "autoControl",
+                            "displayName": "Auto heating/cooling",
+                            "type": "bool",
+                            "defaultValue": false
+                        },
+                        {
+                            "id": "64bf308f-a543-4e02-b787-1a1714c1f978",
+                            "name": "temperatureDifference",
+                            "displayName": "Temperature difference",
+                            "type": "double",
+                            "unit": "DegreeCelsius",
+                            "minValue": 0.00,
+                            "defaultValue": 2.00
                         }
                     ],
                     "stateTypes": [