diff --git a/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java b/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
index 7d0f1757b77fc944427c9e134043e7cd412e288d..729bf52ac7ca0e422010658b3edfd16d589cb1ec 100644
--- a/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
+++ b/src/main/java/org/olat/admin/quota/QuotaManagerImpl.java
@@ -170,7 +170,10 @@ public class QuotaManagerImpl implements QuotaManager, InitializingBean {
 	 */
 	@Override
 	public Quota getDefaultQuota(String identifyer) {
-		return defaultQuotas.get(identifyer);
+		if(StringHelper.containsNonWhitespace(identifyer)) {
+			return defaultQuotas.get(identifyer);
+		}
+		return null;
 	}
 
 	/**
diff --git a/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java b/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java
index 9c673c6d1c9b005da63f4a9c9f482a1a0b91a3a9..53cddd568bb1b2746ace6d53307ea08b57f7d407 100644
--- a/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java
+++ b/src/main/java/org/olat/group/ui/wizard/BGConfigToolsStepController.java
@@ -22,6 +22,7 @@ package org.olat.group.ui.wizard;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.olat.admin.quota.QuotaConstants;
 import org.olat.collaboration.CalendarToolSettingsController;
 import org.olat.collaboration.CollaborationTools;
 import org.olat.collaboration.CollaborationToolsFactory;
@@ -118,7 +119,7 @@ public class BGConfigToolsStepController extends StepFormBasicController {
 				
 				//add quota configuration for admin only
 				if(quotaManager.hasMinimalRolesToEditquota(roles)) {
-					Quota quota = quotaManager.createQuota(null, null, null);
+					Quota quota = quotaManager.createQuota(QuotaConstants.IDENTIFIER_DEFAULT_GROUPS, null, null);
 					config.quotaCtrl = new BGConfigQuotaController(ureq, getWindowControl(), quota, mainForm);
 					config.configContainer.add("quota", config.quotaCtrl.getInitialFormItem());
 					config.quotaCtrl.getInitialFormItem().setVisible(false);