diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index 108116ad..1e6520a3 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -35,7 +35,7 @@ Server_ProtocolHandler::~Server_ProtocolHandler()
 		Server_Game *g = gameIterator.value().first;
 		Server_Player *p = gameIterator.value().second;
 		
-		if (authState == UnknownUser)
+		if ((authState == UnknownUser) || p->getSpectator())
 			g->removePlayer(p);
 		else
 			p->setProtocolHandler(0);