diff --git a/ouroboros-network/demo/chain-sync.hs b/ouroboros-network/demo/chain-sync.hs
index 53b7a0718f1..ac9bd58f14f 100644
--- a/ouroboros-network/demo/chain-sync.hs
+++ b/ouroboros-network/demo/chain-sync.hs
@@ -154,6 +154,7 @@ clientChainSync sockPaths = withIOManager $ \iocp ->
       connectToNode
         (localSnocket iocp sockPath)
         unversionedHandshakeCodec
+        noTimeLimitsHandshake
         (cborTermVersionDataCodec unversionedProtocolDataCodec)
         nullNetworkConnectTracers
         acceptableVersion
@@ -187,6 +188,7 @@ serverChainSync sockAddr = withIOManager $ \iocp -> do
       (AcceptedConnectionsLimit maxBound maxBound 0)
       (localAddressFromPath sockAddr)
       unversionedHandshakeCodec
+      noTimeLimitsHandshake
       (cborTermVersionDataCodec unversionedProtocolDataCodec)
       acceptableVersion
       (simpleSingletonVersions
@@ -358,6 +360,7 @@ clientBlockFetch sockAddrs = withIOManager $ \iocp -> do
                         connectToNode
                           (localSnocket iocp defaultLocalSocketAddrPath)
                           unversionedHandshakeCodec
+                          noTimeLimitsHandshake
                           (cborTermVersionDataCodec unversionedProtocolDataCodec)
                           nullNetworkConnectTracers
                           acceptableVersion
@@ -413,6 +416,7 @@ serverBlockFetch sockAddr = withIOManager $ \iocp -> do
       (AcceptedConnectionsLimit maxBound maxBound 0)
       (localAddressFromPath sockAddr)
       unversionedHandshakeCodec
+      noTimeLimitsHandshake
       (cborTermVersionDataCodec unversionedProtocolDataCodec)
       acceptableVersion
       (simpleSingletonVersions
diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs b/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs
index 87f2d8b950b..b9931a5784f 100644
--- a/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs
+++ b/ouroboros-network/src/Ouroboros/Network/NodeToClient.hs
@@ -240,6 +240,7 @@ connectTo
 connectTo snocket tracers versions path =
     connectToNode snocket
                   nodeToClientHandshakeCodec
+                  noTimeLimitsHandshake
                   (cborTermVersionDataCodec nodeToClientCodecCBORTerm)
                   tracers
                   acceptableVersion
@@ -270,6 +271,7 @@ withServer sn tracers networkState sd versions errPolicies =
     (AcceptedConnectionsLimit maxBound maxBound 0)
     sd
     nodeToClientHandshakeCodec
+    noTimeLimitsHandshake
     (cborTermVersionDataCodec nodeToClientCodecCBORTerm)
     acceptableVersion
     (SomeResponderApplication <$> versions)
@@ -316,6 +318,7 @@ ncSubscriptionWorker
         (connectToNode'
           sn
           nodeToClientHandshakeCodec
+          noTimeLimitsHandshake
           (cborTermVersionDataCodec nodeToClientCodecCBORTerm)
           (NetworkConnectTracers nsMuxTracer nsHandshakeTracer)
           acceptableVersion
diff --git a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
index a57167bc572..4880365baf7 100644
--- a/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
+++ b/ouroboros-network/src/Ouroboros/Network/NodeToNode.hs
@@ -402,7 +402,7 @@ connectTo
   -> Socket.SockAddr
   -> IO ()
 connectTo sn tr =
-    connectToNode sn nodeToNodeHandshakeCodec
+    connectToNode sn nodeToNodeHandshakeCodec timeLimitsHandshake
                   (cborTermVersionDataCodec nodeToNodeCodecCBORTerm)
                   tr acceptableVersion
 
@@ -434,6 +434,7 @@ withServer sn tracers networkState acceptedConnectionsLimit sd versions errPolic
     acceptedConnectionsLimit
     sd
     nodeToNodeHandshakeCodec
+    timeLimitsHandshake
     (cborTermVersionDataCodec nodeToNodeCodecCBORTerm)
     acceptableVersion
     (SomeResponderApplication <$> versions)
@@ -476,6 +477,7 @@ ipSubscriptionWorker
         (connectToNode'
           sn
           nodeToNodeHandshakeCodec
+          timeLimitsHandshake
           (cborTermVersionDataCodec nodeToNodeCodecCBORTerm)
           (NetworkConnectTracers nsMuxTracer nsHandshakeTracer)
           acceptableVersion
@@ -519,6 +521,7 @@ dnsSubscriptionWorker
       (connectToNode'
         sn
         nodeToNodeHandshakeCodec
+        timeLimitsHandshake
         (cborTermVersionDataCodec nodeToNodeCodecCBORTerm)
         (NetworkConnectTracers ndstMuxTracer ndstHandshakeTracer)
         acceptableVersion
diff --git a/ouroboros-network/test/Test/Socket.hs b/ouroboros-network/test/Test/Socket.hs
index c743a290d40..d50395f24b3 100644
--- a/ouroboros-network/test/Test/Socket.hs
+++ b/ouroboros-network/test/Test/Socket.hs
@@ -43,6 +43,8 @@ import           Ouroboros.Network.Protocol.Handshake.Codec
                      (cborTermVersionDataCodec)
 import           Ouroboros.Network.Protocol.Handshake.Version
                      (acceptableVersion)
+import           Ouroboros.Network.Protocol.Handshake.Codec
+                     (noTimeLimitsHandshake)
 import           Ouroboros.Network.Testing.Serialise
 import           Ouroboros.Network.Util.ShowProxy
 
@@ -157,6 +159,7 @@ demo chain0 updates = withIOManager $ \iocp -> do
       (AcceptedConnectionsLimit maxBound maxBound 0)
       producerAddress
       nodeToNodeHandshakeCodec
+      noTimeLimitsHandshake
       (cborTermVersionDataCodec nodeToNodeCodecCBORTerm)
       acceptableVersion
       (simpleSingletonVersions
@@ -171,6 +174,7 @@ demo chain0 updates = withIOManager $ \iocp -> do
         (connectToNode
           (socketSnocket iocp)
           nodeToNodeHandshakeCodec
+          noTimeLimitsHandshake
           (cborTermVersionDataCodec nodeToNodeCodecCBORTerm)
           nullNetworkConnectTracers
           acceptableVersion