diff --git a/src/k_kart.c b/src/k_kart.c
index 34ce09476..cae1ca055 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3444,11 +3444,6 @@ SINT8 K_GetForwardMove(player_t *player)
 {
 	SINT8 forwardmove = player->cmd.forwardmove;
 
-	if (leveltime < starttime && !(gametyperules & GTR_FREEROAM))
-	{
-		return 0;
-	}
-
 	if (K_KartKickstart(player)) // unlike the brute forward of sneakers, allow for backwards easing here
 	{
 		forwardmove += MAXPLMOVE;
diff --git a/src/p_user.c b/src/p_user.c
index 833963353..e72ef29c8 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -4289,9 +4289,19 @@ void P_PlayerThink(player_t *player)
 	}
 
 	// SRB2kart 010217
-	if (leveltime < introtime)
+	if (!(gametyperules & GTR_FREEROAM))
 	{
-		player->nocontrol = 2;
+		if (leveltime < starttime)
+		{
+			player->nocontrol = 2;
+		}
+	}
+	else
+	{
+		if (leveltime < introtime)
+		{
+			player->nocontrol = 2;
+		}
 	}
 
 	// Synchronizes the "real" amount of time spent in the level.