diff --git a/source/_integrations/opentherm_gw.markdown b/source/_integrations/opentherm_gw.markdown
index 32a85a54ab0..ee6461fe1d7 100644
--- a/source/_integrations/opentherm_gw.markdown
+++ b/source/_integrations/opentherm_gw.markdown
@@ -16,6 +16,7 @@ ha_platforms:
   - binary_sensor
   - climate
   - sensor
+  - switch
 ha_integration_type: integration
 ---
 
@@ -254,3 +255,11 @@ Possible LED modes and their meaning are listed here:
 - E. Transmission error has been detected.
 - M. Boiler requires maintenance.
 - P. Raised power mode active on thermostat interface.
+
+## Disabled configuration entities
+
+{% warning %}
+Please read [this information](http://otgw.tclcode.com/standalone.html) from the designer of the OpenTherm Gateway before considering using the information in this section.
+{% endwarning %}
+For advanced control of your heating system, some `switch` configuration entities can be found on the added `OpenTherm Gateway` device.
+These entities are disabled by default, as they can cause your heating system to run continuously and/or increase your energy consumption significantly if used improperly. In most setups, these entities are not needed and should be left disabled.