diff --git a/src/utils/StructStore.js b/src/utils/StructStore.js
index fa4cd23c..8aa0000a 100644
--- a/src/utils/StructStore.js
+++ b/src/utils/StructStore.js
@@ -1,8 +1,8 @@
 import {
   GC,
   splitItem,
-  IdSet,
-  Transaction, ID, Item // eslint-disable-line
+  Transaction, ID, Item, // eslint-disable-line
+  createDeleteSetFromStructStore
 } from '../internals.js'
 
 import * as math from 'lib0/math'
@@ -14,7 +14,7 @@ export class StructStore {
      * @type {Map<number,Array<GC|Item>>}
      */
     this.clients = new Map()
-    this.ds = new IdSet()
+    // this.ds = new IdSet()
     /**
      * @type {null | { missing: Map<number, number>, update: Uint8Array }}
      */
@@ -24,6 +24,9 @@ export class StructStore {
      */
     this.pendingDs = null
   }
+  get ds () {
+    return createDeleteSetFromStructStore(this)
+  }
 }
 
 /**
diff --git a/src/utils/Transaction.js b/src/utils/Transaction.js
index feebe5ba..255b3325 100644
--- a/src/utils/Transaction.js
+++ b/src/utils/Transaction.js
@@ -308,7 +308,7 @@ const cleanupTransactions = (transactionCleanups, i) => {
     const store = doc.store
     const ds = transaction.deleteSet
     const mergeStructs = transaction._mergeStructs
-    insertIntoIdSet(store.ds, ds)
+    // insertIntoIdSet(store.ds, ds)
     try {
       doc.emit('beforeObserverCalls', [transaction, doc])
       /**
diff --git a/src/utils/encoding.js b/src/utils/encoding.js
index 097d96e8..f2a5a8f4 100644
--- a/src/utils/encoding.js
+++ b/src/utils/encoding.js
@@ -35,7 +35,7 @@ import {
   Skip,
   diffUpdateV2,
   convertUpdateFormatV2ToV1,
-  IdSet, DSDecoderV2, Doc, Transaction, GC, Item, StructStore, // eslint-disable-line
+  IdSet, DSDecoderV2, Doc, Transaction, GC, Item, StructStore, createDeleteSetFromStructStore, // eslint-disable-line
 } from '../internals.js'
 
 import * as encoding from 'lib0/encoding'