diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 59e89e93..c5543177 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -1687,7 +1687,7 @@ void setfollowplayer(int cn)
     // silently ignores invalid player-cn value passed
     if(players.inrange(cn) && players[cn])
     {
-        if(!(m_teammode && !watchingdemo && team_base(players[cn]->team) != team_base(player1->team)))
+        if(!(m_teammode && player1->team != TEAM_SPECT && !watchingdemo && team_base(players[cn]->team) != team_base(player1->team)))
         {
             player1->followplayercn = cn;
             if(player1->spectatemode == SM_FLY) player1->spectatemode = SM_FOLLOW1ST;