diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index c54359426..89cea9d13 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -839,7 +839,7 @@ func shouldUpgrade(cfg config.Wrapper, runtimeOptions RuntimeOptions) bool {
 	if upgrade.DisabledByCompilation {
 		return false
 	}
-	if opts := cfg.Options(); opts.AutoUpgradeIntervalH < 0 {
+	if !cfg.Options().ShouldAutoUpgrade() {
 		return false
 	}
 	if runtimeOptions.NoUpgrade {
diff --git a/lib/config/optionsconfiguration.go b/lib/config/optionsconfiguration.go
index 101e00999..71a9956e3 100644
--- a/lib/config/optionsconfiguration.go
+++ b/lib/config/optionsconfiguration.go
@@ -200,3 +200,7 @@ func (opts OptionsConfiguration) MaxConcurrentIncomingRequestKiB() int {
 	// Roll with it.
 	return opts.RawMaxCIRequestKiB
 }
+
+func (opts OptionsConfiguration) ShouldAutoUpgrade() bool {
+	return opts.AutoUpgradeIntervalH > 0
+}