diff --git a/src/main/java/org/olat/portfolio/manager/EPFrontendManager.java b/src/main/java/org/olat/portfolio/manager/EPFrontendManager.java
index 846445fd0ccc2c1b6fb084c54bd9daadfeb448bb..694ee888bb3489b39211e029b18b0915d2f21328 100755
--- a/src/main/java/org/olat/portfolio/manager/EPFrontendManager.java
+++ b/src/main/java/org/olat/portfolio/manager/EPFrontendManager.java
@@ -187,8 +187,13 @@ public class EPFrontendManager implements UserDataDeletable, DeletableGroupData
 		final Property mapKeyProperty = npm.findProperty(null, null, CollaborationTools.PROP_CAT_BG_COLLABTOOLS, CollaborationTools.KEY_PORTFOLIO);
 		if (mapKeyProperty != null) {
 			final Long mapKey = mapKeyProperty.getLongValue();
-			final PortfolioStructure map = loadPortfolioStructureByKey(mapKey);
-			deletePortfolioStructure(map);
+			final String version = mapKeyProperty.getStringValue();
+			if(!"2".equals(version)) {
+				final PortfolioStructure map = loadPortfolioStructureByKey(mapKey);
+				if(map != null) {
+					deletePortfolioStructure(map);
+				}
+			}
 			return true;
 		}
 		return false;