diff --git a/converters/fromZigbee.js b/converters/fromZigbee.js
index 20bb20e7a2848..34530563f17b1 100644
--- a/converters/fromZigbee.js
+++ b/converters/fromZigbee.js
@@ -1032,7 +1032,7 @@ const converters = {
             }
         },
     },
-    ZNCLDJ11LM_curtain_genAnalogOutput: {
+    ZNCLDJ11LM_ZNCLDJ12LM_curtain_analog_output: {
         cluster: 'genAnalogOutput',
         type: ['attributeReport', 'readResponse'],
         convert: (model, msg, publish, options) => {
diff --git a/converters/toZigbee.js b/converters/toZigbee.js
index 783e3c081fa00..2bb28307f3ccc 100644
--- a/converters/toZigbee.js
+++ b/converters/toZigbee.js
@@ -689,7 +689,7 @@ const converters = {
             await entity.command('genIdentify', 'identifyTime', {identifytime: value}, getOptions(meta));
         },
     },
-    ZNCLDJ11LM_control: {
+    ZNCLDJ11LM_ZNCLDJ12LM_control: {
         key: ['state', 'position'],
         convertSet: async (entity, key, value, meta) => {
             if (key === 'state' && value.toLowerCase() === 'stop') {
diff --git a/devices.js b/devices.js
index 4da87c418f0ce..3c295dad44ab2 100755
--- a/devices.js
+++ b/devices.js
@@ -677,8 +677,17 @@ const devices = [
         description: 'Aqara curtain motor',
         supports: 'open, close, stop, position',
         vendor: 'Xiaomi',
-        fromZigbee: [fz.ZNCLDJ11LM_curtain_genAnalogOutput, fz.cover_position_tilt, fz.ignore_basic_report],
-        toZigbee: [tz.ZNCLDJ11LM_control],
+        fromZigbee: [fz.ZNCLDJ11LM_ZNCLDJ12LM_curtain_analog_output, fz.cover_position_tilt, fz.ignore_basic_report],
+        toZigbee: [tz.ZNCLDJ11LM_ZNCLDJ12LM_control],
+    },
+    {
+        zigbeeModel: ['lumi.curtain.hagl04'],
+        model: 'ZNCLDJ12LM',
+        vendor: 'Xiaomi',
+        description: 'Aqara B1 curtain motor ',
+        supports: 'open, close, stop, position',
+        fromZigbee: [fz.ZNCLDJ11LM_ZNCLDJ12LM_curtain_analog_output, fz.cover_position_tilt, fz.ignore_basic_report],
+        toZigbee: [tz.ZNCLDJ11LM_ZNCLDJ12LM_control],
     },
     {
         zigbeeModel: ['lumi.relay.c2acn01'],