diff --git a/backend/src/index.ts b/backend/src/index.ts
index 7c7ecd6..fd8dfdd 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -20,7 +20,10 @@ export class ConnectionManager {
 
   public manageConnections() {
     backendEvents.subscribe(addMqttConnectionEvent, this.handleConnectionRequest)
-    backendEvents.subscribe(removeConnection, (connectionId: string) => this.removeConnection(connectionId))
+    backendEvents.subscribe(removeConnection, (connectionId: string) => {
+      backendEvents.unsubscribeAll(makePublishEvent(connectionId))
+      this.removeConnection(connectionId)
+    })
   }
 
   private handleConnectionRequest = (event: AddMqttConnection) => {