diff --git a/RustRconServerManager.Backend/Services/RconBackgroundService.Connections.cs b/RustRconServerManager.Backend/Services/RconBackgroundService.Connections.cs
index c824c4c..1555653 100644
--- a/RustRconServerManager.Backend/Services/RconBackgroundService.Connections.cs
+++ b/RustRconServerManager.Backend/Services/RconBackgroundService.Connections.cs
@@ -252,12 +252,12 @@ public void SendRconCommand(string command, int serverId)
             }
 
             // Timeout - no response received
-            _logger.LogWarning("[ExecuteCommandWithResponse] Timeout waiting for response from server {ServerId} for command {Command}", serverId, command);
+            _logger.LogWarning("[ExecuteCommandWithResponse] Timeout waiting for response from server {ServerId} for command {Command}", serverId, command?.Replace("\r", "").Replace("\n", ""));
             return null;
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "[ExecuteCommandWithResponse] Error executing command {Command} on server {ServerId}", command, serverId);
+            _logger.LogError(ex, "[ExecuteCommandWithResponse] Error executing command {Command} on server {ServerId}", command?.Replace("\r", "").Replace("\n", ""), serverId);
             return null;
         }
     }