diff --git a/lib/controller.js b/lib/controller.js
index 5226a660c..233e98f73 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -5,7 +5,6 @@ const settings = require('./util/settings');
 const zigbeeShepherdConverters = require('zigbee-shepherd-converters');
 const homeassistant = require('./homeassistant');
 const objectAssignDeep = require(`object-assign-deep`);
-const debug = require('debug')('zigbee2mqtt:controller');
 
 const mqttConfigRegex = new RegExp(`${settings.get().mqtt.base_topic}/bridge/config/\\w+`, 'g');
 const mqttDeviceRegex = new RegExp(`${settings.get().mqtt.base_topic}/[\\w\\s\\d]+/set`, 'g');
@@ -207,7 +206,7 @@ class Controller {
         // Zigbee message receieved, reset soft reset timeout.
         this.softResetTimeout(true);
 
-        debug('Recieved zigbee message with data', message.data);
+        logger.debug('Recieved zigbee message with data', message.data);
 
         if (message.type == 'devInterview') {
             logger.info('Connecting with device...');
@@ -344,7 +343,7 @@ class Controller {
         } else if (option === 'log_level') {
             const level = message.toString().toLowerCase();
             if (allowedLogLevels.includes(level)) {
-                logger.warn(`Switching log level to '${level}'`);
+                logger.info(`Switching log level to '${level}'`);
                 logger.transports.console.level = level;
                 logger.transports.file.level = level;
             } else {
diff --git a/lib/zigbee.js b/lib/zigbee.js
index eee31b990..cd81925e0 100644
--- a/lib/zigbee.js
+++ b/lib/zigbee.js
@@ -2,7 +2,6 @@ const ZShepherd = require('zigbee-shepherd');
 const logger = require('./util/logger');
 const settings = require('./util/settings');
 const data = require('./util/data');
-const debug = require('debug')('zigbee2mqtt:zigbee');
 const zclPacket = require('zcl-packet');
 
 const advancedSettings = settings.get().advanced;
@@ -139,7 +138,7 @@ class Zigbee {
 
         if (device) {
             // Note: checkOnline has the callback argument but does not call callback
-            debug(`Check online ${deviceID}`);
+            logger.debug(`Check online ${deviceID}`);
             this.shepherd.controller.checkOnline(device);
         }
     }