diff --git a/scripts/zm/replaced/_zm_powerups.gsc b/scripts/zm/replaced/_zm_powerups.gsc
index c12e52b6..b9f05137 100644
--- a/scripts/zm/replaced/_zm_powerups.gsc
+++ b/scripts/zm/replaced/_zm_powerups.gsc
@@ -211,15 +211,7 @@ nuke_powerup( drop_item, player_team )
 			}
 			else if(players[i] maps/mp/zombies/_zm_laststand::player_is_in_laststand())
 			{
-				if(isDefined(level.scr_zm_ui_gametype_obj) && level.scr_zm_ui_gametype_obj == "zgrief")
-				{
-					players[i] thread scripts/zm/zgrief/zgrief_reimagined::player_suicide();
-				}
-				else
-				{
-					players[i] maps/mp/zombies/_zm::spectator_respawn();
-					players[i].revives--;
-				}
+				players[i] thread scripts/zm/zgrief/zgrief_reimagined::player_suicide();
 			}
 		}
 	}
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index d8c5ee1d..08f0cc3a 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1938,6 +1938,13 @@ unlimited_zombies()
 
 player_suicide()
 {
+	if(level.scr_zm_ui_gametype_obj != "zgrief")
+	{
+		self maps/mp/zombies/_zm::spectator_respawn();
+		self.revives--;
+		return;
+	}
+
 	self.playersuicided = 1;
 	self notify( "player_suicide" );