diff --git a/lib/model/model.go b/lib/model/model.go
index 181b6abfc..8c441ef04 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -169,7 +169,7 @@ func NewModel(cfg *config.Wrapper, id protocol.DeviceID, clientName, clientVersi
 		pmut:                sync.NewRWMutex(),
 	}
 	if cfg.Options().ProgressUpdateIntervalS > -1 {
-		go m.progressEmitter.Serve()
+		m.Add(m.progressEmitter)
 	}
 	scanLimiter.setCapacity(cfg.Options().MaxConcurrentScans)
 	cfg.Subscribe(m)