diff --git a/packages/client/src/automerge-editor.ts b/packages/client/src/automerge-editor.ts
index d181e17..77f67fd 100644
--- a/packages/client/src/automerge-editor.ts
+++ b/packages/client/src/automerge-editor.ts
@@ -149,6 +149,10 @@ export const AutomergeEditor = {
   garbageCursor: (e: AutomergeEditor, docId: string) => {
     const doc = e.docSet.getDoc(docId)
 
+    if (!doc) {
+      return
+    }
+
     const changed = Automerge.change<SyncDoc>(doc, (d: any) => {
       delete d.cursors
     })
diff --git a/packages/client/src/withSocketIO.ts b/packages/client/src/withSocketIO.ts
index 03c861a..b748cfa 100644
--- a/packages/client/src/withSocketIO.ts
+++ b/packages/client/src/withSocketIO.ts
@@ -122,6 +122,8 @@ const withSocketIO = <T extends AutomergeEditor>(
    */
 
   e.destroy = () => {
+    e.socket.removeListener('disconnect')
+
     e.socket.close()
 
     e.closeConnection()