diff --git a/src/components/CreateAdministration.vue b/src/components/CreateAdministration.vue
index 1dfb41290..d438ee39f 100644
--- a/src/components/CreateAdministration.vue
+++ b/src/components/CreateAdministration.vue
@@ -263,7 +263,7 @@ const { data: allVariants } = useTaskVariantsQuery(true, {
 // +------------------------------------------------------------------------------------------------------------------+
 // Fetch the data of the currently being edited administration, incl. its assigned assessments.
 const { data: existingAdministrationData } = useAdministrationsQuery([props.adminId], {
-  enabled: initialized.value && !!props.adminId,
+  enabled: initialized && !!props.adminId,
   select: (data) => data[0],
 });
 
@@ -293,7 +293,7 @@ const { data: existingSchoolsData } = useSchoolsQuery(schoolIds, {
 const classIds = computed(() => existingAdministrationData.value?.minimalOrgs?.classes ?? []);
 
 const { data: existingClassesData } = useClassesQuery(classIds, {
-  enabled: initialized.value && classIds.value.length > 0,
+  enabled: initialized,
 });
 
 // Fetch the groups assigned to the administration.