diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 7e91d63f..f61699b9 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1698,7 +1698,7 @@ void setfollowplayer(int cn)
 // set new spect mode
 void spectatemode(int mode)
 {
-    if(player1->state != CS_SPECTATE || (!m_teammode && !team_isspect(player1->team) && servstate.mastermode == MM_MATCH)) return;  // during ffa matches only SPECTATORS can spectate
+    if((player1->state != CS_DEAD && player1->state != CS_SPECTATE && !team_isspect(player1->team)) || (!m_teammode && !team_isspect(player1->team) && servstate.mastermode == MM_MATCH)) return;  // during ffa matches only SPECTATORS can spectate
     if(mode == player1->spectatemode) return;
     showscores(false);
     switch(mode)