diff --git a/internal/app/statemachine/change_command.go b/internal/app/statemachine/change_command.go
index 9ff9a7dd..a7ea4d98 100644
--- a/internal/app/statemachine/change_command.go
+++ b/internal/app/statemachine/change_command.go
@@ -82,7 +82,7 @@ func (s *StateMachine) currentActionTimeRemainingForCommand(command state.Comman
 		return durationpb.New(s.gameConfig.BallPlacementTime)
 	case state.Command_DIRECT:
 		return durationpb.New(s.gameConfig.FreeKickTimeout[division])
-	case state.Command_KICKOFF, state.Command_PENALTY:
+	case state.Command_KICKOFF, state.Command_PENALTY, state.Command_NORMAL_START:
 		return durationpb.New(s.gameConfig.PrepareTimeout)
 	default:
 		return durationpb.New(0)