diff --git a/p2p/discover/table.go b/p2p/discover/table.go
index 8afe77bf1885d3151c0dd2fc1fe1316cac2d73a6..61c62f1878e4ab20bb104bdad69292eac737a409 100644
--- a/p2p/discover/table.go
+++ b/p2p/discover/table.go
@@ -119,7 +119,6 @@ func newTable(t transport, db *enode.DB, bootnodes []*enode.Node, log log.Logger
 	tab.seedRand()
 	tab.loadSeedNodes()
 
-	go tab.loop()
 	return tab, nil
 }
 
diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go
index 811466cf7f5a12ac33dfca682dc6dbc1198be844..71cb1895b0a37f58298d126503023ce71425e227 100644
--- a/p2p/discover/table_util_test.go
+++ b/p2p/discover/table_util_test.go
@@ -42,6 +42,7 @@ func init() {
 func newTestTable(t transport) (*Table, *enode.DB) {
 	db, _ := enode.OpenDB("")
 	tab, _ := newTable(t, db, nil, log.Root())
+	go tab.loop()
 	return tab, db
 }
 
diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go
index cdd42c38a0ccb6ecf679db47ab4707a4b53c267c..3c68beac1c858027ba0efc45d079d1fd4a1f2d48 100644
--- a/p2p/discover/v4_udp.go
+++ b/p2p/discover/v4_udp.go
@@ -253,6 +253,7 @@ func ListenV4(c UDPConn, ln *enode.LocalNode, cfg Config) (*UDPv4, error) {
 		return nil, err
 	}
 	t.tab = tab
+	go tab.loop()
 
 	t.wg.Add(2)
 	go t.loop()