diff --git a/src/client.rs b/src/client.rs
index 25b151f5..8449ff8c 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1428,7 +1428,12 @@ where
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         self.inner.maybe_close_connection_if_no_streams();
-        self.inner.poll(cx).map_err(Into::into)
+        let result = self.inner.poll(cx).map_err(Into::into);
+        if result.is_pending() && !self.inner.has_streams_or_other_references() {
+            tracing::trace!("last stream closed during poll, wake again");
+            cx.waker().wake_by_ref();
+        }
+        result
     }
 }
 
diff --git a/src/proto/connection.rs b/src/proto/connection.rs
index 5969bb84..5589fabc 100644
--- a/src/proto/connection.rs
+++ b/src/proto/connection.rs
@@ -242,6 +242,13 @@ where
         }
     }
 
+    /// Checks if there are any streams or references left
+    pub fn has_streams_or_other_references(&self) -> bool {
+        // If we poll() and realize that there are no streams or references
+        // then we can close the connection by transitioning to GOAWAY
+        self.inner.streams.has_streams_or_other_references()
+    }
+
     pub(crate) fn take_user_pings(&mut self) -> Option<UserPings> {
         self.inner.ping_pong.take_user_pings()
     }