diff --git a/core/node/libp2p/routing.go b/core/node/libp2p/routing.go
index bb2256c48089..4eee5c3a08a4 100644
--- a/core/node/libp2p/routing.go
+++ b/core/node/libp2p/routing.go
@@ -69,7 +69,6 @@ func BaseRouting(experimentalDHTClient bool) interface{} {
 		}
 
 		if dr != nil && experimentalDHTClient {
-			ctx := helpers.LifecycleCtx(mctx, lc)
 			cfg, err := in.Repo.Config()
 			if err != nil {
 				return out, err
@@ -79,7 +78,7 @@ func BaseRouting(experimentalDHTClient bool) interface{} {
 				return out, err
 			}
 
-			expClient, err := fullrt.NewFullRT(ctx, in.Host,
+			expClient, err := fullrt.NewFullRT(in.Host,
 				dht.DefaultPrefix,
 				fullrt.DHTOption(
 					dht.Validator(in.Validator),
@@ -92,7 +91,11 @@ func BaseRouting(experimentalDHTClient bool) interface{} {
 				return out, err
 			}
 
-			// TODO: Start/Stop exp client
+			lc.Append(fx.Hook{
+				OnStop: func(ctx context.Context) error {
+					return expClient.Close()
+				},
+			})
 
 			return processInitialRoutingOut{
 				Router: Router{
diff --git a/go.mod b/go.mod
index d6f01f2a1c12..ea1619a63115 100644
--- a/go.mod
+++ b/go.mod
@@ -66,7 +66,7 @@ require (
 	github.com/libp2p/go-libp2p-core v0.8.5
 	github.com/libp2p/go-libp2p-discovery v0.5.0
 	github.com/libp2p/go-libp2p-http v0.2.0
-	github.com/libp2p/go-libp2p-kad-dht v0.11.2-0.20210512190004-57eeffeacd66
+	github.com/libp2p/go-libp2p-kad-dht v0.11.2-0.20210513065107-ff66a31ed04b
 	github.com/libp2p/go-libp2p-kbucket v0.4.7
 	github.com/libp2p/go-libp2p-loggables v0.1.0
 	github.com/libp2p/go-libp2p-mplex v0.4.1
diff --git a/go.sum b/go.sum
index c5cb42c2de74..5e04f8368315 100644
--- a/go.sum
+++ b/go.sum
@@ -681,8 +681,8 @@ github.com/libp2p/go-libp2p-interface-connmgr v0.0.4/go.mod h1:GarlRLH0LdeWcLnYM
 github.com/libp2p/go-libp2p-interface-connmgr v0.0.5/go.mod h1:GarlRLH0LdeWcLnYM/SaBykKFl9U5JFnbBGruAk/D5k=
 github.com/libp2p/go-libp2p-interface-pnet v0.0.1/go.mod h1:el9jHpQAXK5dnTpKA4yfCNBZXvrzdOU75zz+C6ryp3k=
 github.com/libp2p/go-libp2p-kad-dht v0.11.1/go.mod h1:5ojtR2acDPqh/jXf5orWy8YGb8bHQDS+qeDcoscL/PI=
-github.com/libp2p/go-libp2p-kad-dht v0.11.2-0.20210512190004-57eeffeacd66 h1:bgny9dF7iwddusH2nkqPSbWSehRtbe+AxBox8BTBRrA=
-github.com/libp2p/go-libp2p-kad-dht v0.11.2-0.20210512190004-57eeffeacd66/go.mod h1:zdQYru1c7dnluMpZls4i9Fj2TwYXS7YyDkJ1Yahv0w0=
+github.com/libp2p/go-libp2p-kad-dht v0.11.2-0.20210513065107-ff66a31ed04b h1:cXCr40TRjPQED65saU5U32JLDLhkRGqiRb74TGJ49XI=
+github.com/libp2p/go-libp2p-kad-dht v0.11.2-0.20210513065107-ff66a31ed04b/go.mod h1:zdQYru1c7dnluMpZls4i9Fj2TwYXS7YyDkJ1Yahv0w0=
 github.com/libp2p/go-libp2p-kbucket v0.3.1/go.mod h1:oyjT5O7tS9CQurok++ERgc46YLwEpuGoFq9ubvoUOio=
 github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
 github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=