diff --git a/pkg/nfd-master/nfd-master.go b/pkg/nfd-master/nfd-master.go
index 99f71b3fe..c1eafbf55 100644
--- a/pkg/nfd-master/nfd-master.go
+++ b/pkg/nfd-master/nfd-master.go
@@ -241,8 +241,11 @@ func (m *nfdMaster) Run() error {
 				return err
 			}
 
-		case <-grpcErr:
-			return fmt.Errorf("gRPC server exited with an error: %v", err)
+		case err := <-grpcErr:
+			if err != nil {
+				return fmt.Errorf("gRPC server exited with an error: %v", err)
+			}
+			klog.Infof("gRPC server stopped")
 
 		case <-m.stop:
 			klog.Infof("shutting down nfd-master")