diff --git a/app/index.js b/app/index.js
index b1fd339..b854efd 100644
--- a/app/index.js
+++ b/app/index.js
@@ -119,6 +119,7 @@ class GlobalBindings {
 
         // Handle messages
         client.on('message', (sender, message, users, channels, trees) => {
+          sender = sender || { __ui: 'Server' }
           ui.log.push({
             type: 'chat-message',
             user: sender.__ui,