diff --git a/internal/app/config/config.go b/internal/app/config/config.go
index 7a97729e..c1560077 100644
--- a/internal/app/config/config.go
+++ b/internal/app/config/config.go
@@ -60,7 +60,7 @@ type Game struct {
 	BallPlacementMinRobotDistance         float64                    `yaml:"ball-placement-min-robot-distance"`
 	DistanceToBallInStop                  float64                    `yaml:"distance-to-ball-in-stop"`
 	AutoApproveGoals                      bool                       `yaml:"auto-approve-goals"`
-	ContinueFromHalt                      bool                       `yaml:"continue-from-halt"`
+	SuggestEndOfMatch                     bool                       `yaml:"suggest-end-of-match"`
 	RecommendHalfTimes                    bool                       `yaml:"recommend-half-times"`
 	ChallengeFlags                        int32                      `yaml:"challenge-flags"`
 	EmergencyStopGracePeriod              time.Duration              `yaml:"emergency-stop-grace-period"`
@@ -192,7 +192,7 @@ func DefaultControllerConfig() (c Controller) {
 	c.Game.BallPlacementMinRobotDistance = 0.05
 	c.Game.DistanceToBallInStop = 0.5
 	c.Game.AutoApproveGoals = false
-	c.Game.ContinueFromHalt = false
+	c.Game.SuggestEndOfMatch = true
 	c.Game.RecommendHalfTimes = true
 	c.Game.ChallengeFlags = 3
 	c.Game.EmergencyStopGracePeriod = 10 * time.Second
diff --git a/internal/app/config/testdata/config.yaml b/internal/app/config/testdata/config.yaml
index f7f472b1..c1d4069c 100644
--- a/internal/app/config/testdata/config.yaml
+++ b/internal/app/config/testdata/config.yaml
@@ -43,7 +43,7 @@ game:
   ball-placement-min-robot-distance: 0.05
   distance-to-ball-in-stop: 0.5
   auto-approve-goals: false
-  continue-from-halt: false
+  suggest-end-of-match: true
   recommend-half-times: true
   challenge-flags: 3
   emergency-stop-grace-period: 10s
diff --git a/internal/app/engine/process_continue_next_action.go b/internal/app/engine/process_continue_next_action.go
index d57c58ac..b6ed3389 100644
--- a/internal/app/engine/process_continue_next_action.go
+++ b/internal/app/engine/process_continue_next_action.go
@@ -145,7 +145,7 @@ func (e *Engine) actionsToContinueFromStop() (actions []*ContinueAction, hints [
 			ContinueAction_READY_MANUAL,
 		))
 	}
-	if suggestEndOfMatch(e.currentState) {
+	if e.gameConfig.SuggestEndOfMatch && suggestEndOfMatch(e.currentState) {
 		actions = append(actions, createContinueAction(
 			ContinueAction_END_GAME,
 			state.Team_UNKNOWN,