diff --git a/beacon_chain/eth2_network.nim b/beacon_chain/eth2_network.nim
index 189e0224e..980a6bd6f 100644
--- a/beacon_chain/eth2_network.nim
+++ b/beacon_chain/eth2_network.nim
@@ -228,7 +228,7 @@ when networkBackend in [libp2p, libp2pDaemon]:
       await node.start()
 
       proc checkIfConnectedToBootstrapNode {.async.} =
-        await sleepAsync(10.seconds)
+        await sleepAsync(30.seconds)
         if bootstrapEnrs.len > 0 and libp2p_successful_dials.value == 0:
           fatal "Failed to connect to any bootstrap node. Quitting", bootstrapEnrs
           quit 1
diff --git a/beacon_chain/libp2p_backend.nim b/beacon_chain/libp2p_backend.nim
index 66fc9e1c2..cd1ced58e 100644
--- a/beacon_chain/libp2p_backend.nim
+++ b/beacon_chain/libp2p_backend.nim
@@ -192,10 +192,6 @@ proc dialPeer*(node: Eth2Node, peerInfo: PeerInfo) {.async.} =
   debug "Initializing connection"
   await initializeConnection(peer)
 
-  # TODO: This should happen automatically in the future in nim-libp2p
-  debug "Subscribing to pubsub"
-  await peer.network.switch.subscribeToPeer(peer.info)
-
   inc libp2p_successful_dials
   debug "Network handshakes completed"
 
diff --git a/vendor/nim-libp2p b/vendor/nim-libp2p
index cb156f326..6a7f9f058 160000
--- a/vendor/nim-libp2p
+++ b/vendor/nim-libp2p
@@ -1 +1 @@
-Subproject commit cb156f3260d35c49b0039ee73c623cdf95658888
+Subproject commit 6a7f9f058c04ecdfd26e5dbfd8df88221b8511e7