diff --git a/k8s-mpam-controller/pkg/agent/watcher.go b/k8s-mpam-controller/pkg/agent/watcher.go
index e68aa5f2a044785fd77b3d22b0ca6b0aa1bb2a81..35f85885e25185c00f3c2b50a5889ef1091380df 100644
--- a/k8s-mpam-controller/pkg/agent/watcher.go
+++ b/k8s-mpam-controller/pkg/agent/watcher.go
@@ -92,7 +92,9 @@ func (w *watcher) watchNode() {
 					w.Lock()
 					w.groupName = group
 					w.Unlock()
-					w.watchGroupConfigMap()
+					if w.groupConfigMapWatch != nil {
+						w.groupConfigMapWatch.Stop()
+					}
 				}
 			case watch.Deleted:
 				klog.Warning("our node is removed...")
@@ -142,9 +144,6 @@ func (w *watcher) watchNodeConfigMap() {
 }
 
 func (w *watcher) watchGroupConfigMap() {
-	if w.groupConfigMapWatch != nil {
-		w.groupConfigMapWatch.Stop()
-	}
 
 	// watch group ConfigMap
 	cmName := "rc-config.default"