diff --git a/core/node/libp2p/routingopt.go b/core/node/libp2p/routingopt.go
index 39d8cf9773a..d7f4f7a18a0 100644
--- a/core/node/libp2p/routingopt.go
+++ b/core/node/libp2p/routingopt.go
@@ -26,7 +26,9 @@ func constructDHTRouting(mode dht.ModeOpt) func(ctx context.Context, host host.H
 }
 
 var (
-	DHTOption       RoutingOption = constructDHTRouting(dht.ModeAuto)
+	// FIXME: Set this to dht.ModeAuto once we resolve
+	// https://github.com/libp2p/go-libp2p-kad-dht/issues/564
+	DHTOption       RoutingOption = constructDHTRouting(dht.ModeServer)
 	DHTClientOption               = constructDHTRouting(dht.ModeClient)
 	DHTServerOption               = constructDHTRouting(dht.ModeServer)
 	NilRouterOption               = nilrouting.ConstructNilRouting