diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
index 759886ff..2532a907 100644
--- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
+++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/MobileControlWebsocketServer.cs
@@ -275,18 +275,7 @@ namespace PepperDash.Essentials.WebSocketServer
                     };
                 }
 
-                _server.Log.Output = (data, message) =>
-            {
-                switch (data.Level)
-                {
-                    case LogLevel.Trace: this.LogVerbose(message); break;
-                    case LogLevel.Debug: this.LogDebug(message); break;
-                    case LogLevel.Info: this.LogInformation(message); break;
-                    case LogLevel.Warn: this.LogWarning(message); break;
-                    case LogLevel.Error: this.LogError(message); break;
-                    case LogLevel.Fatal: this.LogFatal(message); break;
-                }
-            };
+                _server.Log.Output = (data, message) => Utilities.ConvertWebsocketLog(data, message, this);
 
                 // setting to trace to allow logging level to be controlled by appdebug
                 _server.Log.Level = LogLevel.Trace;
diff --git a/src/PepperDash.Essentials.MobileControl/WebSocketServer/UiClient.cs b/src/PepperDash.Essentials.MobileControl/WebSocketServer/UiClient.cs
index 21781abc..83696ef2 100644
--- a/src/PepperDash.Essentials.MobileControl/WebSocketServer/UiClient.cs
+++ b/src/PepperDash.Essentials.MobileControl/WebSocketServer/UiClient.cs
@@ -89,7 +89,7 @@ namespace PepperDash.Essentials.WebSocketServer
 
             _connectionTime = DateTime.Now;
 
-            Log.Output = (data, message) => Utilities.ConvertWebsocketLog(data, message);
+            Log.Output = (data, message) => Utilities.ConvertWebsocketLog(data, message, this);
             Log.Level = LogLevel.Trace;
 
             if (Controller == null)