diff --git a/src/sync.js b/src/sync.js
index 7392b8f..9123011 100644
--- a/src/sync.js
+++ b/src/sync.js
@@ -255,13 +255,13 @@ const Sync = async ({ ipfs, log, events, onSynced, start, timeout }) => {
    */
   const stopSync = async () => {
     if (started) {
+      started = false
       await queue.onIdle()
       ipfs.libp2p.services.pubsub.removeEventListener('subscription-change', handlePeerSubscribed)
       ipfs.libp2p.services.pubsub.removeEventListener('message', handleUpdateMessage)
       await ipfs.libp2p.unhandle(headsSyncAddress)
       await ipfs.libp2p.services.pubsub.unsubscribe(address)
       peers.clear()
-      started = false
     }
   }
 
diff --git a/test/orbitdb-write-access.test.js b/test/orbitdb-write-access.test.js
index af2a0ae..9c2d820 100644
--- a/test/orbitdb-write-access.test.js
+++ b/test/orbitdb-write-access.test.js
@@ -297,10 +297,6 @@ describe('Write Permissions', function () {
     await db1.close()
     await db2.close()
 
-    await new Promise(resolve => {
-      setTimeout(() => resolve(), 1000)
-    })
-
     db1 = await orbitdb1.open('write-test', { AccessController: OrbitDBAccessController() })
     db2 = await orbitdb2.open(db1.address)