diff --git a/scripts/zm/replaced/_zm_gametype.gsc b/scripts/zm/replaced/_zm_gametype.gsc
index 0e3ebcec..39e4d362 100644
--- a/scripts/zm/replaced/_zm_gametype.gsc
+++ b/scripts/zm/replaced/_zm_gametype.gsc
@@ -174,23 +174,30 @@ onplayerspawned()
 
 hide_gump_loading_for_hotjoiners()
 {
-	if(isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
-	{
-		return;
-	}
-
 	self endon( "disconnect" );
+
 	self.rebuild_barrier_reward = 1;
 	self.is_hotjoining = 1;
+
 	num = self getsnapshotackindex();
+
+	wait 0.5;
+
 	while ( num == self getsnapshotackindex() )
 	{
-		wait 0.25;
+		wait 0.05;
 	}
-	wait 0.5;
+
 	self maps\mp\zombies\_zm::spawnspectator();
 	self.is_hotjoining = 0;
 	self.is_hotjoin = 1;
+
+	if(isDefined(level.should_respawn_func) && [[level.should_respawn_func]]())
+	{
+		level thread maps\mp\zombies\_zm::spectators_respawn();
+		return;
+	}
+
 	if ( is_true( level.intermission ) || is_true( level.host_ended_game ) )
 	{
 		setclientsysstate( "levelNotify", "zi", self );