diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 44b31a2cb..26b6dbf6e 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -401,7 +401,7 @@ func main() {
 		return
 	}
 
-	if options.noRestart {
+	if innerProcess || options.noRestart {
 		syncthingMain(options)
 	} else {
 		monitorMain(options)
diff --git a/cmd/syncthing/monitor.go b/cmd/syncthing/monitor.go
index 89cd82462..f64ee88ac 100644
--- a/cmd/syncthing/monitor.go
+++ b/cmd/syncthing/monitor.go
@@ -35,7 +35,6 @@ const (
 )
 
 func monitorMain(runtimeOptions RuntimeOptions) {
-	os.Setenv("STNORESTART", "yes")
 	os.Setenv("STMONITORED", "yes")
 	l.SetPrefix("[monitor] ")