diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
index 99f71b3fe..3c906dbb7 100644
--- a/pkg/nfd-master/nfd-master.go
+++ b/pkg/nfd-master/nfd-master.go
@@ -254,7 +254,7 @@ func (m *nfdMaster) Run() error {
 
 // Stop NfdMaster
 func (m *nfdMaster) Stop() {
-	m.server.Stop()
+	m.server.GracefulStop()
 
 	if m.nfdController != nil {
 		m.nfdController.stop()