diff --git a/khatru/handlers.go b/khatru/handlers.go
index e954413..5f9684d 100644
--- a/khatru/handlers.go
+++ b/khatru/handlers.go
@@ -290,6 +290,8 @@ func (rl *Relay) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
 					ws.WriteJSON(resp)
 
 				case *nostr.ReqEnvelope:
+					rl.removeListenerId(ws, env.SubscriptionID)
+
 					eose := sync.WaitGroup{}
 					eose.Add(len(env.Filters))