diff --git a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
index a51f7b3ee9..c451293454 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/authenticated.rs
@@ -102,6 +102,9 @@ pub(crate) struct AuthenticatedHandler<R, S, St> {
 // explicitly remove handle from the global store upon being dropped
 impl<R, S, St> Drop for AuthenticatedHandler<R, S, St> {
     fn drop(&mut self) {
+        // WIP(JON): Also remove from is_active_pending_replies
+        self.inner.is_active_pending_replies.remove(&self.client.address);
+
         self.inner
             .active_clients_store
             .disconnect(self.client.address)