diff --git a/kernel/src/main/java/org/cristalise/kernel/persistency/ClusterStorageManager.java b/kernel/src/main/java/org/cristalise/kernel/persistency/ClusterStorageManager.java
index 8e8131db0..822d924b0 100644
--- a/kernel/src/main/java/org/cristalise/kernel/persistency/ClusterStorageManager.java
+++ b/kernel/src/main/java/org/cristalise/kernel/persistency/ClusterStorageManager.java
@@ -511,8 +511,7 @@ public void commit(Object locker) throws PersistencyException {
             thisStore.commit(locker);
         }
         if(locker != null){
-            messageSet = proxyMessagesMap.get(locker);
-            proxyMessagesMap.remove(locker);
+            messageSet = proxyMessagesMap.remove(locker);
             if (messageSet != null){
                for (ProxyMessage message: messageSet){
                     Gateway.getProxyServer().sendProxyEvent(message);