diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
index 5eda86559c..98ef6689de 100644
--- a/pkg/nfd-master/nfd-master.go
+++ b/pkg/nfd-master/nfd-master.go
@@ -394,10 +394,7 @@ func (m *nfdMaster) Stop() {
 		m.nfdController.stop()
 	}
 
-	select {
-	case m.stop <- struct{}{}:
-	default:
-	}
+	close(m.stop)
 }
 
 // Wait until NfdMaster is able able to accept connections.