diff --git a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Client.kt b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Client.kt
index 12ef2ce52..78f07b6b7 100644
--- a/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Client.kt
+++ b/ammolite/src/main/java/com/vitorpamplona/ammolite/relays/Client.kt
@@ -169,7 +169,7 @@ object Client : RelayPool.Listener {
                     relay: Relay,
                     subscriptionId: String?,
                 ) {
-                    if (type == Relay.StateType.DISCONNECT) {
+                    if (type == Relay.StateType.DISCONNECT || type == Relay.StateType.EOSE) {
                         latch.countDown()
                         Log.d("sendAndWaitForResponse", "onRelayStateChange Disconnected from relay ${relay.url} count: ${latch.count}")
                     }