diff --git a/pkg/storage/etcd/etcd_watcher.go b/pkg/storage/etcd/etcd_watcher.go
index 7b6ac901771..9487728a459 100644
--- a/pkg/storage/etcd/etcd_watcher.go
+++ b/pkg/storage/etcd/etcd_watcher.go
@@ -158,7 +158,9 @@ func (w *etcdWatcher) etcdWatch(ctx context.Context, client etcd.KeysAPI, key st
 		AfterIndex: resourceVersion,
 	}
 	watcher := client.Watcher(key, &opts)
+	w.stopLock.Lock()
 	w.ctx, w.cancel = context.WithCancel(ctx)
+	w.stopLock.Unlock()
 
 	for {
 		resp, err := watcher.Next(w.ctx)