diff --git a/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs b/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs
index 78a1b0c7d0..518e534c7c 100644
--- a/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs
+++ b/OpenRA.Mods.RA/Player/SurrenderOnDisconnect.cs
@@ -24,10 +24,8 @@ namespace OpenRA.Mods.RA
 
 		public void Tick(Actor self)
 		{
-			if (Disconnected) return;
-
 			var p = self.Owner;
-
+			if (Disconnected || !p.PlayerReference.Playable) return;
 			if (p.WinState == WinState.Lost || p.WinState == WinState.Won) return; /* already won or lost */
 
 			var client = p.World.LobbyInfo.ClientWithIndex(p.ClientIndex);