diff --git a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java b/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
index 4347e62adae..9a35caefbf7 100644
--- a/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
+++ b/p2p/src/main/java/bisq/network/p2p/storage/P2PDataStorage.java
@@ -201,8 +201,10 @@ public void onBootstrapComplete() {
             // Batch processing can cause performance issues, so we give listeners a chance to deal with it by notifying
             // about start and end of iteration.
             hashMapChangedListeners.forEach(HashMapChangedListener::onBatchRemoveExpiredDataStarted);
-            toRemoveSet.forEach(protectedDataToRemove -> hashMapChangedListeners.forEach(
-                            listener -> listener.onRemoved(protectedDataToRemove)));
+            toRemoveSet.forEach(protectedStorageEntry -> {
+                hashMapChangedListeners.forEach(l -> l.onRemoved(protectedStorageEntry));
+                removeFromProtectedDataStore(protectedStorageEntry);
+            });
             hashMapChangedListeners.forEach(HashMapChangedListener::onBatchRemoveExpiredDataCompleted);
 
             if (sequenceNumberMap.size() > 1000)
@@ -483,21 +485,26 @@ && checkSignature(protectedStorageEntry)
 
             broadcast(new RemoveDataMessage(protectedStorageEntry), sender, null, isDataOwner);
 
-            if (protectedStoragePayload instanceof PersistablePayload) {
-                ByteArray compactHash = getCompactHashAsByteArray(protectedStoragePayload);
-                ProtectedStorageEntry previous = protectedDataStoreService.remove(compactHash, protectedStorageEntry);
-                if (previous != null) {
-                    protectedDataStoreListeners.forEach(e -> e.onRemoved(protectedStorageEntry));
-                } else {
-                    log.info("We cannot remove the protectedStorageEntry from the persistedEntryMap as it does not exist.");
-                }
-            }
+            removeFromProtectedDataStore(protectedStorageEntry);
         } else {
             log.debug("remove failed");
         }
         return result;
     }
 
+    private void removeFromProtectedDataStore(ProtectedStorageEntry protectedStorageEntry) {
+        ProtectedStoragePayload protectedStoragePayload = protectedStorageEntry.getProtectedStoragePayload();
+        if (protectedStoragePayload instanceof PersistablePayload) {
+            ByteArray compactHash = getCompactHashAsByteArray(protectedStoragePayload);
+            ProtectedStorageEntry previous = protectedDataStoreService.remove(compactHash, protectedStorageEntry);
+            if (previous != null) {
+                protectedDataStoreListeners.forEach(e -> e.onRemoved(protectedStorageEntry));
+            } else {
+                log.info("We cannot remove the protectedStorageEntry from the persistedEntryMap as it does not exist.");
+            }
+        }
+    }
+
     @SuppressWarnings("UnusedReturnValue")
     public boolean removeMailboxData(ProtectedMailboxStorageEntry protectedMailboxStorageEntry, @Nullable NodeAddress sender, boolean isDataOwner) {
         ByteArray hashOfData = get32ByteHashAsByteArray(protectedMailboxStorageEntry.getProtectedStoragePayload());