diff --git a/p2p/server.go b/p2p/server.go
index 1f859089af..6a10f7f525 100644
--- a/p2p/server.go
+++ b/p2p/server.go
@@ -490,6 +490,11 @@ func (srv *Server) setupDiscovery() error {
 		}
 		srv.discv5, err = discover.ListenV5(sconn, srv.localnode, cfg)
 		if err != nil {
+			// Clean up v4 if v5 setup fails.
+			if srv.discv4 != nil {
+				srv.discv4.Close()
+				srv.discv4 = nil
+			}
 			return err
 		}
 	}