diff --git a/functions/linearSD/fn_startNewRound.sqf b/functions/linearSD/fn_startNewRound.sqf
index e05ce20..02b29ca 100644
--- a/functions/linearSD/fn_startNewRound.sqf
+++ b/functions/linearSD/fn_startNewRound.sqf
@@ -49,8 +49,8 @@ publicVariable QGVAR(roundNumber);
     sleep 8;
 
     // preparation time is handled by mission setup in first round
-    if (GVAR(roundNumber) > 1) then {
-        [["PREPARATION_TIME", 0] call BIS_fnc_getParamValue,{
+    if (GVAR(roundNumber) > 1 || (["PREPARATION_TIME", 0] call BIS_fnc_getParamValue) == 0) then {
+        [(["PREPARATION_TIME", 0] call BIS_fnc_getParamValue) max 10,{
             missionNamespace setVariable [QGVAR(roundTimeLeft),GVAR(roundLength),true];
             missionNamespace setVariable [QGVAR(roundInProgress),true,true];
         }] call EFUNC(missionSetup,startPreparationTime);
diff --git a/functions/missionSetup/fn_startPreparationTime.sqf b/functions/missionSetup/fn_startPreparationTime.sqf
index 9d03cea..ca09153 100644
--- a/functions/missionSetup/fn_startPreparationTime.sqf
+++ b/functions/missionSetup/fn_startPreparationTime.sqf
@@ -2,7 +2,7 @@
 
 params [["_preparationTime",0],["_onComplete",{}]];
 
-if (_preparationTime <= 0) exitWith {};
+if (_preparationTime <= 0) exitWith _onComplete;
 _preparationTime = _preparationTime max 5;
 
 [{