diff --git a/SharedLibraryCore/Commands/CommandProcessing.cs b/SharedLibraryCore/Commands/CommandProcessing.cs
index 2d2dbedd3..a85ad282b 100644
--- a/SharedLibraryCore/Commands/CommandProcessing.cs
+++ b/SharedLibraryCore/Commands/CommandProcessing.cs
@@ -85,8 +85,8 @@ namespace SharedLibraryCore.Commands
                         {
                             found = Manager.FindActiveClient(found);
                             E.Target = found;
-                            E.Target.CurrentServer = E.Owner;
-                            E.Data = String.Join(" ", Args.Skip(1));
+                            E.Target.CurrentServer = found.CurrentServer ?? E.Owner;
+                            E.Data = string.Join(" ", Args.Skip(1));
                         }
                     }