diff --git a/TM_TimeAttackRounds_Online.Script.txt b/TM_TimeAttackRounds_Online.Script.txt
index 7bd256c..0e0c0ed 100644
--- a/TM_TimeAttackRounds_Online.Script.txt
+++ b/TM_TimeAttackRounds_Online.Script.txt
@@ -226,6 +226,12 @@ Map_MapsPerMatch = S_MapsPerMatch;
 UpdateScoresTableFooterAndTimeLimit(StartTime, S_TimeLimit, S_MapsPerMatch);
 ***
 
+***Match_StartRound***
+***
+StartTime = Now + Race::C_SpawnDuration;
+UpdateScoresTableFooterAndTimeLimit(StartTime, S_TimeLimit, S_MapsPerMatch);
+***
+
 ***Match_InitPlayLoop***
 ***
 Round_Skipped = False;
@@ -328,6 +334,20 @@ if (Net_ScriptEnvironment != S_ScriptEnvironment) {
 }
 ***
 
+***Rounds_CheckStopRound***
+***
+// If time limit is reached
+if (EndTime > 0 && Now >= EndTime) {
+	MB_StopRound();
+	Round_Skipped = False;
+}
+// If forced end round or round skipped after pause
+if (Round_ForceEndRound || Round_SkipPauseRound) {
+	MB_StopRound();
+	Round_Skipped = False;
+}
+***
+
 ***Match_EndRound***
 ***
 Race::StopSkipOutroAll();