diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go
index 70a98bd640..fc19b85308 100644
--- a/cmd/devp2p/discv4cmd.go
+++ b/cmd/devp2p/discv4cmd.go
@@ -121,9 +121,15 @@ func discv4RandomNodes(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
+	defer disc.Close()
+
 	iter := disc.RandomNodes()
 	for {
-		fmt.Println(iter.NextNode(context.Background()))
+		n, ok := iter.NextNode(context.Background())
+		if !ok {
+			return nil
+		}
+		fmt.Println(n)
 	}
 }