diff --git a/src/main/java/org/olat/portfolio/ui/structel/edit/EPStructureDetailsController.java b/src/main/java/org/olat/portfolio/ui/structel/edit/EPStructureDetailsController.java
index cb9cb9f2613ec6644ec8e35d1d14e7ecf64b2e82..7ed1ba07926e6509219d56286397e38ba7431c1c 100644
--- a/src/main/java/org/olat/portfolio/ui/structel/edit/EPStructureDetailsController.java
+++ b/src/main/java/org/olat/portfolio/ui/structel/edit/EPStructureDetailsController.java
@@ -345,8 +345,14 @@ public class EPStructureDetailsController extends FormBasicController {
 			final TextElement amountElement = amountElements.get(i);
 			
 			final CollectRestriction cr = (CollectRestriction) restrictionElement.getUserObject();
-			final String restriction = restrictionElement.getSelectedKey();
-			final String artefactType = restrictToArtefactElement.getSelectedKey();
+			String restriction = "";
+			if(restrictionElement.isOneSelected()) {
+				restriction = restrictionElement.getSelectedKey();
+			}
+			String artefactType = "";
+			if(restrictToArtefactElement.isOneSelected()) {
+				artefactType = restrictToArtefactElement.getSelectedKey();
+			}
 			final String amount = amountElement.getValue();
 			
 			cr.setRestriction(restriction);