diff --git a/rust/connlib/tunnel/src/gateway.rs b/rust/connlib/tunnel/src/gateway.rs
index aad43b5fd..ebb95b921 100644
--- a/rust/connlib/tunnel/src/gateway.rs
+++ b/rust/connlib/tunnel/src/gateway.rs
@@ -90,10 +90,10 @@ impl GatewayState {
             return Ok(None);
         }
 
-        let peer = self
-            .peers
-            .peer_by_ip_mut(dst)
-            .context("Couldn't find connection by IP")?;
+        let Some(peer) = self.peers.peer_by_ip_mut(dst) else {
+            tracing::debug!(%dst, "Unknown client, perhaps already disconnected?");
+            return Ok(None);
+        };
         let cid = peer.id();
 
         let packet = peer