diff --git a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java
index 5af82684d6..ef43d04b1a 100644
--- a/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java
+++ b/source/java/org/alfresco/repo/avm/actions/AVMUndoSandboxListAction.java
@@ -85,19 +85,22 @@ public class AVMUndoSandboxListAction extends ActionExecuterAbstractBase
             }
 
             final Map<QName, PropertyValue> dnsProperties = fAVMService.queryStorePropertyKey(item.getSecond().split(":")[0], QName.createQName(null, ".dns%"));
-            String webProject = dnsProperties.keySet().iterator().next().getLocalName();
-            webProject = webProject.substring(webProject.lastIndexOf('.') + 1, webProject.length());
-            String path = item.getSecond().substring(item.getSecond().indexOf(":") + 1);
-            if (fgLogger.isDebugEnabled())
-               fgLogger.debug("unlocking file " + path + " in web project " + webProject);
+            if (dnsProperties.size() == 1)
+            {
+                String webProject = dnsProperties.keySet().iterator().next().getLocalName();
+                webProject = webProject.substring(webProject.lastIndexOf('.') + 1, webProject.length());
+                String path = item.getSecond().substring(item.getSecond().indexOf(":") + 1);
+                if (fgLogger.isDebugEnabled())
+                    fgLogger.debug("unlocking file " + path + " in web project " + webProject);
 
-            if (fAVMLockingService.getLock(webProject, path) != null)
-            {
-               fAVMLockingService.removeLock(webProject, path);
-            }
-            else
-            {
-               fgLogger.warn("expected file " + path + " in " + webProject + " to be locked");
+                if (fAVMLockingService.getLock(webProject, path) != null)
+                {
+                    fAVMLockingService.removeLock(webProject, path);
+                }
+                else
+                {
+                    fgLogger.warn("expected file " + path + " in " + webProject + " to be locked");
+                }
             }
         }
     }