diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 33b1c07d..363f8b4b 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -470,6 +470,8 @@ void respawnself()
         setscope(false);
 	    spawnplayer(player1);
         player1->lifesequence++;
+        player1->weaponswitch(player1->primweap);
+        player1->weaponchanging -= weapon::weaponchangetime/2;
     }
 }
 
@@ -495,8 +497,6 @@ bool tryrespawn()
                 return false;
             }
             respawnself();
-		    player1->weaponswitch(player1->primweap);
-            player1->lastaction -= weapon::weaponchangetime/2;
             return true;
         }
         else lastspawnattempt = lastmillis;
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 634e8aa1..a9f5cb52 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -357,6 +357,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
                     if(m_botmode) BotManager.RespawnBots();
                 }
                 addmsg(SV_SPAWN, "rii", player1->lifesequence, player1->weaponsel->type);
+                player1->weaponswitch(player1->primweap);
+                player1->weaponchanging -= weapon::weaponchangetime/2;
                 break;
             }