diff --git a/common/src/main/java/bisq/common/persistence/PersistenceManager.java b/common/src/main/java/bisq/common/persistence/PersistenceManager.java
index b0772c72eb..b3076a2c90 100644
--- a/common/src/main/java/bisq/common/persistence/PersistenceManager.java
+++ b/common/src/main/java/bisq/common/persistence/PersistenceManager.java
@@ -112,8 +112,7 @@ public class PersistenceManager<T extends PersistableEnvelope> {
                                          AtomicInteger openInstances,
                                          PersistenceManager<?> persistenceManager) {
         persistenceManager.shutdown();
-        openInstances.decrementAndGet();
-        if (openInstances.get() == 0) {
+        if (openInstances.decrementAndGet() == 0) {
             log.info("flushAllDataToDisk completed");
             UserThread.execute(completeHandler::handleResult);
         }