diff --git a/src/zr/zspawn.inc b/src/zr/zspawn.inc
index 1aac8aa..60d2ffc 100644
--- a/src/zr/zspawn.inc
+++ b/src/zr/zspawn.inc
@@ -599,6 +599,9 @@ ZSpawnCondition:GetZSpawnCondition(int client)
                 case ZSpawn_Human:
                 {
                     condition = ZSpawn_Human;
+                    // Client has been infected this round, respawning as a zombie.
+                    if(condition == ZSpawn_Human && g_bZSpawnClientInfected[client])
+                        condition = ZSpawn_Zombie;
                 }
                 case ZSpawn_Zombie:
                 {
@@ -608,9 +611,5 @@ ZSpawnCondition:GetZSpawnCondition(int client)
         }
     }
 
-    // Client has been infected this round, respawning as a zombie.
-    if(condition == ZSpawn_Human && g_bZSpawnClientInfected[client])
-        condition = ZSpawn_Zombie;
-
     return condition;
 }