diff --git a/src/space/services/space-validation.service.ts b/src/space/services/space-validation.service.ts
index be173b0..c9080db 100644
--- a/src/space/services/space-validation.service.ts
+++ b/src/space/services/space-validation.service.ts
@@ -165,10 +165,10 @@ export class ValidationService {
       where: { uuid: spaceModelUuid },
       relations: [
         'subspaceModels',
-        'subspaceModels.tags',
-        'tags',
-        'subspaceModels.tags.product',
-        'tags.product',
+        'subspaceModels.productAllocations',
+        'subspaceModels.productAllocations.tags',
+        'productAllocations.product',
+        'productAllocations.tags',
       ],
     });
 
diff --git a/src/space/services/space.service.ts b/src/space/services/space.service.ts
index 46e584b..73ee5ee 100644
--- a/src/space/services/space.service.ts
+++ b/src/space/services/space.service.ts
@@ -106,7 +106,7 @@ export class SpaceService {
       this.validateUniqueTags(allTags);
       if (spaceModelUuid) {
         const hasDependencies = subspaces?.length > 0 || tags?.length > 0;
-        if (!hasDependencies && !newSpace.spaceModel) {
+        if (!hasDependencies) {
           await this.spaceModelService.linkToSpace(
             newSpace,
             spaceModel,