diff --git a/support/docgen.js b/support/docgen.js
index 1e5d4983e..33326f706 100644
--- a/support/docgen.js
+++ b/support/docgen.js
@@ -94,9 +94,15 @@ const homeassistantConfig = (device) => {
     };
 
     if (payload.command_topic) {
-        payload.command_topic = `zigbee2mqtt/<FRIENDLY_NAME>/set`;
+        if (payload.command_topic_prefix) {
+            payload.command_topic = `zigbee2mqtt/<FRIENDLY_NAME>/${payload.command_topic_prefix}/set`;
+        } else {
+            payload.command_topic = `zigbee2mqtt/<FRIENDLY_NAME>/set`;
+        }
     }
 
+    delete payload.command_topic_prefix;
+
     let yml = YAML.stringify([payload]);
     yml = yml.replace(/(-) \n    /g, '- ');
     yml = yml.replace('---', `${device.type}:`)