diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index f952d289..7a591695 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -38,10 +38,14 @@ class TagChipDisplay extends StatelessWidget {
   final List<SpaceTemplateModel>? allSpaceModels;
   final List<Tag> projectTags;
 
-  Map<ProductModel, int> get _groupedTags => TagHelper.groupTags([
-        ...?spaceModel?.tags,
-        ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
-      ]);
+  Map<ProductModel, int> get _groupedTags {
+    final spaceTags = spaceModel?.tags ?? <Tag>[];
+
+    final subspaces = spaceModel?.subspaceModels ?? [];
+    final subspaceTags = subspaces.expand((e) => e.tags ?? <Tag>[]).toList();
+
+    return TagHelper.groupTags([...spaceTags, ...subspaceTags]);
+  }
 
   @override
   Widget build(BuildContext context) {