diff --git a/lib/controller.js b/lib/controller.js
index 0a45692a9..7265154bb 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -282,10 +282,14 @@ class Controller {
         if (!converters.length) {
             if (cid) {
                 logger.warn(
-                    `No converter available for '${mappedModel.model}' with cid '${cid}' and type '${message.type}'`
+                    `No converter available for '${mappedModel.model}' with cid '${cid}', ` +
+                    `type '${message.type}' and message '${JSON.stringify(message)}'`
                 );
             } else if (cmdId) {
-                logger.warn(`No converter available for '${mappedModel.model}' with cmd '${cmdId}'`);
+                logger.warn(
+                    `No converter available for '${mappedModel.model}' with cmd '${cmdId}' ` +
+                    `and message '${JSON.stringify(message)}'`
+                );
             }
 
             logger.warn(`Please see: https://github.com/Koenkk/zigbee2mqtt/wiki/How-to-support-new-devices.`);