diff --git a/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
index 6d65e1ded..d95c18533 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
@@ -384,7 +384,7 @@ namespace Barotrauma.Networking
                         c.InGame && !c.NeedsMidRoundSync && 
                         c.Name == character.OwnerClientName && 
                         c.Connection.RemoteEndPoint.Address.ToString() == character.OwnerClientIP);
-                    if (owner != null)
+                    if (owner != null && (!AllowSpectating || !owner.SpectateOnly))
                     {
                         SetClientCharacter(owner, character);
                     }