diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index 2ca6515a1c..ed29d0f008 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -565,7 +565,7 @@ Further device support has been made with the assistance of users. Please consid
 - [chris-garbas](https://github.com/chris-garbas) for contributing improvements to IPS pro heatpump.
 - [Nyotee](https://github.com/Nyotee) for assisting with support for Tesla Smart AUX series air conditioner.
 - [psuet](https://github.com/psuet) for assisting with support for XCase lock boxes.
-- [Zylazy](https://github.com/Zylazy) for assisting with support for Hoenyzy valve timers.
+- [Zylazy](https://github.com/Zylazy) for assisting with support for Hoenyzy valve timer and contributing support for Nybro heater.
 - [Zelaf](https://github.com/Zelaf) for contributing improvements to Nedis portable air conditioner.
 - [hwhesselink](https://github.com/hwhesselink) for contributing support for Amico ceiling fans.
 - [JohnyDNU](https://github.com/JohnyDNU) for contributing support for Sensei Air Conditioner.
diff --git a/DEVICES.md b/DEVICES.md
index e32608d229..773df4a745 100644
--- a/DEVICES.md
+++ b/DEVICES.md
@@ -47,6 +47,7 @@
 - MRC Magnum floor heating
 - Nedis ceramic PTC fan heater
 - Nedis convection heater - WIFIHTPL20F model
+- Nybro heater
 - Orion OWH-PTC2000 heater
 - Princess 350 panel heater
 - Prosto PTC 2000 heater
diff --git a/custom_components/tuya_local/devices/nybro_heater.yaml b/custom_components/tuya_local/devices/nybro_heater.yaml
new file mode 100644
index 0000000000..c2fe913f53
--- /dev/null
+++ b/custom_components/tuya_local/devices/nybro_heater.yaml
@@ -0,0 +1,64 @@
+name: NYBRO heater
+products:
+  - id: ahzyjjcfbe1ehrbt
+primary_entity:
+  entity: climate
+  dps:
+    - id: 1
+      type: boolean
+      name: hvac_mode
+      mapping:
+        - dps_val: false
+          value: "off"
+        - dps_val: true
+          value: "heat"
+    - id: 2
+      name: temperature
+      type: integer
+      range:
+        min: 5
+        max: 35
+    - id: 3
+      name: current_temperature
+      type: integer
+    - id: 4
+      type: string
+      name: preset_mode
+      mapping:
+        - dps_val: low
+          value: eco
+        - dps_val: high
+          value: boost
+        - dps_val: af
+          value: away
+    - id: 1
+      type: boolean
+      name: hvac_action
+      mapping:
+        - dps_val: false
+          value: "off"
+        - constraint: heating
+          conditions:
+            - dps_val: false
+              value: idle
+            - dps_val: true
+              value: heating
+    - id: 101
+      type: boolean
+      name: heating
+      hidden: true
+secondary_entities:
+  - entity: binary_sensor
+    class: problem
+    category: diagnostic
+    dps:
+      - id: 12
+        type: bitfield
+        name: sensor
+        mapping:
+          - dps_val: 0
+            value: false
+          - value: true
+      - id: 12
+        type: bitfield
+        name: fault_code