diff --git a/src/dorkbox/network/aeron/EventPoller.kt b/src/dorkbox/network/aeron/EventPoller.kt
index f9287eea..00678bab 100644
--- a/src/dorkbox/network/aeron/EventPoller.kt
+++ b/src/dorkbox/network/aeron/EventPoller.kt
@@ -227,10 +227,14 @@ internal class EventPoller {
     }
 
     private suspend fun doClose() {
+        val wasRunning = running
+
         running = false
         shutdownLatch.await()
         configured = false
 
-        dispatchScope.cancel("Closed event dispatch")
+        if (wasRunning) {
+            dispatchScope.cancel("Closed event dispatch")
+        }
     }
 }