diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,3 +1,7 @@
+1.2.4
+-----
+* Fix possible connection issues if Authentication or Identification processes takes too long to complete.
+
 1.2.3
 -----
 * No longer terminate the connection in case of `IdentificationTimeout`.
diff --git a/Database/EventStore/Internal/ConnectionManager.hs b/Database/EventStore/Internal/ConnectionManager.hs
--- a/Database/EventStore/Internal/ConnectionManager.hs
+++ b/Database/EventStore/Internal/ConnectionManager.hs
@@ -523,6 +523,8 @@
     onAuthentication _ = Nothing
 
     runningConnection (Connecting _ (ConnectionEstablishing c)) = conn == c
+    runningConnection (Connecting _ (Authentication _ _ c)) = conn == c
+    runningConnection (Connecting _ (Identification _ _ c)) = conn == c
     runningConnection (Connected c) = conn == c
     runningConnection _ = False
 
diff --git a/eventstore.cabal b/eventstore.cabal
--- a/eventstore.cabal
+++ b/eventstore.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: b66c8845aecb18585c4ce46f6fbeba6b39f32cfcb1c9b709a5ba54233017023f
+-- hash: c9911a422246a5be440ff6488ce51535e4428fcd8bb1514a94970f10f9ef698d
 
 name:           eventstore
-version:        1.2.3
+version:        1.2.4
 synopsis:       EventStore TCP Client
 description:    EventStore TCP Client <https://eventstore.org>
 category:       Database