diff --git a/lib/controller.js b/lib/controller.js
index 5cc85a128..2861104b1 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -135,7 +135,8 @@ class Controller {
         logger.debug(
             `Received zigbee message of type '${message.type}' with data '${JSON.stringify(message.data)}'` +
             (device ? ` of device '${device.modelId}' (${device.ieeeAddr})` : '') +
-            (message.groupid ? ` with groupID ${message.groupID}` : '')
+            (message.groupid ? ` with groupID ${message.groupID}` : '') +
+            (message.endpoints.length ? ` of endpoint ${message.endpoints[0].epId}` : '')
         );
 
         // Call extensions.