diff --git a/leaderboard.lua b/leaderboard.lua
index ef223fc..d4b20d4 100644
--- a/leaderboard.lua
+++ b/leaderboard.lua
@@ -321,12 +321,15 @@ local function ingame()
 end
 
 local function initLeaderboard(player)
-	if disable and leveltime < START_TIME then
-		disable = ingame() > 1
+	if cv_enable.value and G_RaceGametype() then
+		if disable and leveltime < START_TIME then
+			disable = ingame() > 1
+		else
+			disable = $ or ingame() > 1
+		end
 	else
-		disable = disable or ingame() > 1
+		disable = true
 	end
-	disable = $ or not cv_enable.value
 
 	-- Restore encore mode to initial value
 	if disable and EncoreInitial != nil then