diff --git a/internal/daemon/worker/worker.go b/internal/daemon/worker/worker.go index d6513270eb..ae55cd64b7 100644 --- a/internal/daemon/worker/worker.go +++ b/internal/daemon/worker/worker.go @@ -712,9 +712,11 @@ func (w *Worker) Shutdown() error { ar.SetAddresses(nil) } - err := w.storageEventListener.Shutdown(w.baseContext) - if err != nil { - return fmt.Errorf("error shutting down worker event listener: %w", err) + if w.storageEventListener != nil { + err := w.storageEventListener.Shutdown(w.baseContext) + if err != nil { + return fmt.Errorf("error shutting down worker event listener: %w", err) + } } w.started.Store(false)