diff --git a/src/dorkbox/network/connection/EndPoint.kt b/src/dorkbox/network/connection/EndPoint.kt
index 859b5582..10ad1cd8 100644
--- a/src/dorkbox/network/connection/EndPoint.kt
+++ b/src/dorkbox/network/connection/EndPoint.kt
@@ -45,6 +45,7 @@ import kotlinx.coroutines.runBlocking
 import mu.KLogger
 import mu.KotlinLogging
 import org.agrona.DirectBuffer
+import org.agrona.concurrent.IdleStrategy
 
 
 // If TCP and UDP both fill the pipe, THERE WILL BE FRAGMENTATION and dropped UDP packets!
@@ -85,6 +86,7 @@ internal constructor(val type: Class<*>, internal val config: Configuration) : A
     private val handshakeKryo: KryoExtra
 
     private val sendIdleStrategy: CoroutineIdleStrategy
+    private val sendIdleStrategyHandshake: IdleStrategy
 
     /**
      * Crypto and signature management
@@ -123,6 +125,8 @@ internal constructor(val type: Class<*>, internal val config: Configuration) : A
         // serialization stuff
         serialization = config.serialization
         sendIdleStrategy = config.sendIdleStrategy
+        sendIdleStrategyHandshake = sendIdleStrategy.cloneToNormal()
+
         handshakeKryo = serialization.initHandshakeKryo()
 
         // we have to be able to specify the property store
@@ -296,7 +300,7 @@ internal constructor(val type: Class<*>, internal val config: Configuration) : A
 
     @Suppress("DuplicatedCode")
     // note: CANNOT be called in action dispatch. ALWAYS ON SAME THREAD
-    internal suspend fun writeHandshakeMessage(publication: Publication, message: HandshakeMessage) {
+    internal fun writeHandshakeMessage(publication: Publication, message: HandshakeMessage) {
         // The handshake sessionId IS NOT globally unique
         logger.trace {
             "[${publication.sessionId()}] send HS: $message"
@@ -329,7 +333,7 @@ internal constructor(val type: Class<*>, internal val config: Configuration) : A
                  */
                 if (result >= Publication.ADMIN_ACTION) {
                     // we should retry.
-                    sendIdleStrategy.idle()
+                    sendIdleStrategyHandshake.idle()
                     continue
                 }
 
@@ -344,7 +348,7 @@ internal constructor(val type: Class<*>, internal val config: Configuration) : A
             ListenerManager.cleanStackTrace(exception, 2) // 2 because we do not want to see the stack for the abstract `newException`
             listenerManager.notifyError(exception)
         } finally {
-            sendIdleStrategy.reset()
+            sendIdleStrategyHandshake.reset()
         }
     }