diff --git a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
index ad3fa8fc10..f5d67381b0 100644
--- a/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
+++ b/plugins/controlled-documents-resources/src/components/docspace/CreateDocumentsSpace.svelte
@@ -74,6 +74,8 @@
 
     rolesAssignment = getRolesAssignment()
   }
+  $: descriptors =
+    spaceType?.descriptor !== undefined ? [spaceType.descriptor] : [documents.descriptor.DocumentSpaceType]
 
   function getRolesAssignment (): RolesAssignment {
     if (docSpace === undefined || spaceType?.targetClass === undefined || spaceType?.$lookup?.roles === undefined) {
@@ -239,7 +241,7 @@
 
       <SpaceTypeSelector
         disabled={!isNew}
-        descriptors={[documents.descriptor.DocumentSpaceType]}
+        {descriptors}
         type={typeId}
         focusIndex={4}
         kind="regular"
diff --git a/plugins/view-resources/src/components/SpaceTypeSelector.svelte b/plugins/view-resources/src/components/SpaceTypeSelector.svelte
index ec543095e1..af759ee507 100644
--- a/plugins/view-resources/src/components/SpaceTypeSelector.svelte
+++ b/plugins/view-resources/src/components/SpaceTypeSelector.svelte
@@ -28,7 +28,7 @@
 
   let types: SpaceType[] = []
   const typesQ = createQuery()
-  const query = {
+  $: query = {
     descriptor: { $in: descriptors }
   }
   $: typesQ.query(core.class.SpaceType, query, (result) => {