diff --git a/src/k_kart.c b/src/k_kart.c
index 14e764e40..08164b2d8 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -98,13 +98,14 @@ void K_TimerReset(void)
 	starttime = introtime = 3;
 	numbulbs = 1;
 	inDuel = rainbowstartavailable = false;
+	timelimitintics = extratimeintics = secretextratime = 0;
 }
 
 void K_TimerInit(void)
 {
 	UINT8 i;
 	UINT8 numPlayers = 0;
-	boolean singleplayercontext = ((modeattacking != ATTACKING_NONE)
+	boolean domodeattack = ((modeattacking != ATTACKING_NONE)
 		|| (grandprixinfo.gp == true && grandprixinfo.eventmode != GPEVENT_NONE));
 
 	if (specialStage.active == true)
@@ -113,7 +114,7 @@ void K_TimerInit(void)
 	}
 	else if (bossinfo.boss == false)
 	{
-		if (!singleplayercontext)
+		if (!domodeattack)
 		{
 			for (i = 0; i < MAXPLAYERS; i++)
 			{
@@ -127,7 +128,7 @@ void K_TimerInit(void)
 
 			if (numPlayers < 2)
 			{
-				singleplayercontext = true;
+				domodeattack = true;
 			}
 			else
 			{
@@ -148,12 +149,13 @@ void K_TimerInit(void)
 		starttime = (introtime + (3*TICRATE)) + ((2*TICRATE) + (numbulbs * bulbtime)); // Start countdown time, + buffer time
 	}
 
-	timelimitintics = extratimeintics = secretextratime = 0;
+	K_BattleInit(domodeattack);
+
 	if ((gametyperules & GTR_TIMELIMIT) && !bossinfo.boss && !modeattacking)
 	{
-		if (singleplayercontext)
+		if (!K_CanChangeRules(true))
 		{
-			if (grandprixinfo.gp)
+			if (battlecapsules)
 			{
 				timelimitintics = (20*TICRATE);
 			}
@@ -171,8 +173,6 @@ void K_TimerInit(void)
 		}
 	}
 
-	K_BattleInit(singleplayercontext);
-
 	if (inDuel == true)
 	{
 		K_SpawnDuelOnlyItems();