diff --git a/scripts/zm/replaced/_zm_weap_emp_bomb.gsc b/scripts/zm/replaced/_zm_weap_emp_bomb.gsc
index b7860ea0..6e7de761 100644
--- a/scripts/zm/replaced/_zm_weap_emp_bomb.gsc
+++ b/scripts/zm/replaced/_zm_weap_emp_bomb.gsc
@@ -88,7 +88,7 @@ player_perk_pause_and_unpause_all_perks(time)
 	self player_perk_pause_all_perks();
 	self thread player_perk_pause_all_perks_acquired(time);
 
-	wait time;
+	self waittill_any_or_timeout(time, "bled_out", "player_suicide");
 
 	self player_perk_unpause_all_perks();
 }
@@ -99,8 +99,6 @@ player_perk_pause_all_perks_acquired(time)
 	self endon("player_perk_pause_and_unpause_all_perks");
 	self endon("disconnect");
 
-	self thread player_perk_pause_all_perks_acquired_timeout(time);
-
 	while(1)
 	{
 		self waittill("perk_acquired");
@@ -111,16 +109,6 @@ player_perk_pause_all_perks_acquired(time)
 	}
 }
 
-player_perk_pause_all_perks_acquired_timeout(time)
-{
-	self endon("player_perk_pause_and_unpause_all_perks");
-	self endon("disconnect");
-
-	wait 30;
-
-	self notify("player_perk_pause_all_perks_acquired_timeout");
-}
-
 player_perk_pause_all_perks()
 {
 	vending_triggers = getentarray( "zombie_vending", "targetname" );
@@ -132,6 +120,8 @@ player_perk_pause_all_perks()
 
 player_perk_unpause_all_perks()
 {
+	self notify("player_perk_pause_all_perks_acquired_timeout");
+
 	vending_triggers = getentarray( "zombie_vending", "targetname" );
 	foreach ( trigger in vending_triggers )
 	{
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 3874ca8c..da630f9f 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1999,15 +1999,14 @@ unlimited_powerups()
 
 player_suicide()
 {
+	self notify( "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" );
 
 	wait_network_frame();