diff --git a/src/cvars.cpp b/src/cvars.cpp
index 0dccdcdb6..6ed5b04c6 100644
--- a/src/cvars.cpp
+++ b/src/cvars.cpp
@@ -784,7 +784,7 @@ consvar_t cv_timelimit = UnsavedNetVar("timelimit", "Default").min_max(1, 30*60,
 consvar_t cv_votetime = UnsavedNetVar("votetime", "20").min_max(10, 3600);
 
 consvar_t cv_dueltimelimit = UnsavedNetVar("dueltimelimit", "180").min_max(0, 3600);
-consvar_t cv_duelscorelimit = UnsavedNetVar("duelscorelimit", "3").min_max(1, 9);
+consvar_t cv_duelscorelimit = UnsavedNetVar("duelscorelimit", "4").min_max(1, 9);
 
 //
 // Online cheats - synced in netgames.
diff --git a/src/p_spec.c b/src/p_spec.c
index 074819acb..fc91dfad4 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -2066,24 +2066,32 @@ static void K_HandleLapIncrement(player_t *player)
 
 			if (rainbowstartavailable == true && player->mo->hitlag == 0)
 			{
-				S_StartSound(player->mo, sfx_s23c);
-				player->startboost = 125;
-
-				K_SpawnDriftBoostExplosion(player, 4);
-				K_SpawnDriftElectricSparks(player, SKINCOLOR_SILVER, false);
-				K_SpawnAmps(player, (K_InRaceDuel()) ? 20 : 35, player->mo);
-
-				if (g_teamplay)
+				if (K_InRaceDuel())
 				{
-					for (UINT8 j = 0; i < MAXPLAYERS; i++)
+					K_SpawnDriftElectricSparks(player, player->skincolor, false);
+					K_SpawnAmps(player, 20, player->mo);
+				}
+				else
+				{
+					S_StartSound(player->mo, sfx_s23c);
+					player->startboost = 125;
+
+					K_SpawnDriftBoostExplosion(player, 4);
+					K_SpawnDriftElectricSparks(player, SKINCOLOR_SILVER, false);
+					K_SpawnAmps(player, (K_InRaceDuel()) ? 20 : 35, player->mo);
+
+					if (g_teamplay)
 					{
-						if (!playeringame[j] || players[j].spectator || !players[j].mo || P_MobjWasRemoved(players[j].mo))
-							continue;
-						if (!G_SameTeam(player, &players[j]))
-							continue;
-						if (player == &players[j])
-							continue;
-						K_SpawnAmps(&players[j], 10, player->mo);
+						for (UINT8 j = 0; i < MAXPLAYERS; i++)
+						{
+							if (!playeringame[j] || players[j].spectator || !players[j].mo || P_MobjWasRemoved(players[j].mo))
+								continue;
+							if (!G_SameTeam(player, &players[j]))
+								continue;
+							if (player == &players[j])
+								continue;
+							K_SpawnAmps(&players[j], 10, player->mo);
+						}
 					}
 				}