diff --git a/src/adapter/zigate/adapter/zigateAdapter.ts b/src/adapter/zigate/adapter/zigateAdapter.ts
index a8c09edd83..932c0a7719 100644
--- a/src/adapter/zigate/adapter/zigateAdapter.ts
+++ b/src/adapter/zigate/adapter/zigateAdapter.ts
@@ -234,12 +234,14 @@ class ZiGateAdapter extends Adapter {
 
                 case Zdo.ClusterId.BIND_REQUEST:
                 case Zdo.ClusterId.UNBIND_REQUEST: {
-                    // extra zeroes for endpoint XXX: not needed?
-                    const zeroes = 15 - payload.length;
-                    const prefixedPayload = Buffer.alloc(payload.length + zeroes);
-                    prefixedPayload.set(payload, 0);
-
-                    payload = prefixedPayload;
+                    // only need adjusting when Zdo.MULTICAST_BINDING
+                    if (payload.length === 14) {
+                        // extra zero for endpoint
+                        const prefixedPayload = Buffer.alloc(payload.length + 1);
+                        prefixedPayload.set(payload, 0);
+
+                        payload = prefixedPayload;
+                    }
 
                     break;
                 }