diff --git a/pkg/nfd-topology-updater/nfd-topology-updater.go b/pkg/nfd-topology-updater/nfd-topology-updater.go
index 6889f8eb80..0f8095fb8a 100644
--- a/pkg/nfd-topology-updater/nfd-topology-updater.go
+++ b/pkg/nfd-topology-updater/nfd-topology-updater.go
@@ -218,10 +218,7 @@ func (w *nfdTopologyUpdater) Run() error {
 
 // Stop NFD Topology Updater
 func (w *nfdTopologyUpdater) Stop() {
-	select {
-	case w.stop <- struct{}{}:
-	default:
-	}
+	close(w.stop)
 }
 
 func (w *nfdTopologyUpdater) updateNodeResourceTopology(zoneInfo v1alpha2.ZoneList, scanResponse resourcemonitor.ScanResponse, readKubeletConfig bool) error {
diff --git a/pkg/nfd-worker/nfd-worker.go b/pkg/nfd-worker/nfd-worker.go
index 99ee50859c..b86b3a888b 100644
--- a/pkg/nfd-worker/nfd-worker.go
+++ b/pkg/nfd-worker/nfd-worker.go
@@ -303,10 +303,7 @@ func (w *nfdWorker) Run() error {
 
 // Stop NfdWorker
 func (w *nfdWorker) Stop() {
-	select {
-	case w.stop <- struct{}{}:
-	default:
-	}
+	close(w.stop)
 }
 
 // getGrpcClient returns client connection to the NFD gRPC server. It creates a