diff --git a/engine/server/sv_client.c b/engine/server/sv_client.c
index 8262ae0f..a7bb9d35 100644
--- a/engine/server/sv_client.c
+++ b/engine/server/sv_client.c
@@ -1893,6 +1893,12 @@ static qboolean SV_Kill_f( sv_client_t *cl )
 {
 	if( !SV_IsValidEdict( cl->edict ))
 		return true;
+	
+	if( cl->state != cs_spawned )
+	{
+		SV_ClientPrintf( cl, "Can't suicide - not connected!\n" );
+		return true;
+	}
 
 	if( cl->edict->v.health <= 0.0f )
 	{