diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index a2ed9e42..c94c60ae 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -1235,22 +1235,7 @@ set_weapon_ammo_clip_left(weapon, amount)
 
 setscoreboardcolumns_gametype()
 {
-	if (getDvar("g_gametype") == "zgrief")
-	{
-		if (getDvar("ui_gametype_obj") == "zcontainment" || getDvar("ui_gametype_obj") == "zmeat")
-		{
-			setscoreboardcolumns("score", "captures", "killsconfirmed", "downs", "revives");
-		}
-		else if (getDvar("ui_gametype_obj") == "zgrief" || getDvar("ui_gametype_obj") == "zsnr")
-		{
-			setscoreboardcolumns("score", "killsdenied", "killsconfirmed", "downs", "revives");
-		}
-		else
-		{
-			setscoreboardcolumns("score", "kills", "killsconfirmed", "downs", "revives");
-		}
-	}
-	else
+	if (level.scr_zm_ui_gametype != "zgrief")
 	{
 		setscoreboardcolumns("score", "kills", "headshots", "downs", "revives");
 	}
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 6c2cafe3..e9cd7b89 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -68,6 +68,7 @@ init()
 	setteamscore("allies", 0);
 
 	set_grief_vars();
+	grief_setscoreboardcolumns_gametype();
 	grief_gamemode_hud();
 	grief_score_hud();
 	enemy_powerup_hud();
@@ -106,6 +107,22 @@ init()
 	level thread all_voice_on_intermission();
 }
 
+grief_setscoreboardcolumns_gametype()
+{
+	if (level.scr_zm_ui_gametype_obj == "zcontainment" || level.scr_zm_ui_gametype_obj == "zmeat")
+	{
+		setscoreboardcolumns("score", "captures", "killsconfirmed", "downs", "revives");
+	}
+	else if (level.scr_zm_ui_gametype_obj == "zrace")
+	{
+		setscoreboardcolumns("score", "kills", "killsconfirmed", "downs", "revives");
+	}
+	else
+	{
+		setscoreboardcolumns("score", "killsdenied", "killsconfirmed", "downs", "revives");
+	}
+}
+
 grief_gamemode_hud()
 {
 	level.grief_gamemode_hud = newHudElem();