diff --git a/scripts/zm/replaced/zgrief.gsc b/scripts/zm/replaced/zgrief.gsc
index 711c35fd..89940b09 100644
--- a/scripts/zm/replaced/zgrief.gsc
+++ b/scripts/zm/replaced/zgrief.gsc
@@ -134,6 +134,11 @@ meat_stink( who )
 	who.ignoreme = 0;
 	level.meat_player = who;
 
+	if (level.scr_zm_ui_gametype_obj == "zmeat")
+	{
+		who.player_waypoint.alpha = 0;
+	}
+
 	players = get_players();
 	foreach (player in players)
 	{
diff --git a/scripts/zm/replaced/zmeat.gsc b/scripts/zm/replaced/zmeat.gsc
index 0bae777d..c8d81ea9 100644
--- a/scripts/zm/replaced/zmeat.gsc
+++ b/scripts/zm/replaced/zmeat.gsc
@@ -201,6 +201,11 @@ item_meat_on_spawn_retrieve_trigger( watcher, player, weaponname )
 
 	player setMoveSpeedScale(1);
 
+	if (level.scr_zm_ui_gametype_obj == "zmeat")
+	{
+		player.player_waypoint.alpha = 1;
+	}
+
 	players = get_players();
 	foreach (other_player in players)
 	{
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index f531b361..dad69350 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -2986,11 +2986,6 @@ meat_think()
 			if (!isDefined(held_time))
 			{
 				held_time = getTime();
-
-				level.meat_player.player_waypoint.alpha = 0;
-				level.meat_player.obj_waypoint.alpha = 0;
-
-				level.meat_player thread show_player_waypoint_on_meat_drop();
 			}
 
 			foreach (player in players)
@@ -3080,16 +3075,6 @@ meat_think()
 	}
 }
 
-show_player_waypoint_on_meat_drop()
-{
-	while (isDefined(level.meat_player))
-	{
-		wait 0.05;
-	}
-
-	self.player_waypoint.alpha = 0;
-}
-
 meat_powerup_custom_time(powerup)
 {
 	if (powerup.powerup_name == "meat_stink")