diff --git a/lib/units/websocket/index.js b/lib/units/websocket/index.js
index 06a0b47f..a04e3882 100644
--- a/lib/units/websocket/index.js
+++ b/lib/units/websocket/index.js
@@ -95,8 +95,6 @@ module.exports = function(options) {
     user.ip = socket.handshake.query.uip || req.ip
     socket.emit('socket.ip', user.ip)
 
-    var messageListener = wirerouter()
-
     function joinChannel(channel) {
       channels.push(channel)
       channelRouter.on(channel, messageListener)
@@ -120,7 +118,7 @@ module.exports = function(options) {
       }
     }
 
-    messageListener
+    var messageListener = wirerouter()
       .on(wire.DeviceLogMessage, function(channel, message) {
         socket.emit('device.log', message)
       })