diff --git a/lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart b/lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart
index 5553d8b0..3790991e 100644
--- a/lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart
+++ b/lib/pages/spaces_management/space_model/bloc/create_space_model_bloc.dart
@@ -239,6 +239,7 @@ class CreateSpaceModelBloc
                   for (var tag in newSubspace.tags!) {
                     tagUpdates.add(TagModelUpdate(
                         action: Action.add,
+                        uuid: tag.uuid,
                         tag: tag.tag,
                         productUuid: tag.product?.uuid));
                   }
@@ -325,6 +326,7 @@ class CreateSpaceModelBloc
             tagUpdates.add(TagModelUpdate(
                 action: Action.add,
                 tag: newTag.tag,
+                uuid: newTag.uuid,
                 productUuid: newTag.product?.uuid));
             processedTags.add(newTag.tag);
           }
diff --git a/lib/pages/spaces_management/space_model/models/subspace_template_model.dart b/lib/pages/spaces_management/space_model/models/subspace_template_model.dart
index 6c73741b..9c69b4c8 100644
--- a/lib/pages/spaces_management/space_model/models/subspace_template_model.dart
+++ b/lib/pages/spaces_management/space_model/models/subspace_template_model.dart
@@ -20,7 +20,7 @@ class SubspaceTemplateModel {
     final String internalId = json['internalId'] ?? const Uuid().v4();
 
     return SubspaceTemplateModel(
-      uuid: json['uuid'] ?? '',
+      uuid: json['uuid'],
       subspaceName: json['subspaceName'] ?? '',
       internalId: internalId,
       disabled: json['disabled'] ?? false,
diff --git a/lib/pages/spaces_management/space_model/models/tag_model.dart b/lib/pages/spaces_management/space_model/models/tag_model.dart
index c1ab4f40..4878ead7 100644
--- a/lib/pages/spaces_management/space_model/models/tag_model.dart
+++ b/lib/pages/spaces_management/space_model/models/tag_model.dart
@@ -21,7 +21,7 @@ class TagModel extends BaseTag {
     final String internalId = json['internalId'] ?? const Uuid().v4();
 
     return TagModel(
-      uuid: json['uuid'] ?? '',
+      uuid: json['uuid'] ,
       internalId: internalId,
       tag: json['tag'] ?? '',
       product: json['product'] != null