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 b3f3d978..1eaa3425 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
@@ -40,10 +40,11 @@ class TagChipDisplay extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if ((spaceModel?.tags?.isNotEmpty == true ||
-        spaceModel?.subspaceModels
-                ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
-            true)) {
+    final hasTags = spaceModel?.tags?.isNotEmpty ?? false;
+    final hasSubspaceTags =
+        spaceModel?.subspaceModels?.any((e) => e.tags?.isNotEmpty ?? false) ?? false;
+
+    if (hasTags || hasSubspaceTags) {
       return SizedBox(
         width: screenWidth * 0.25,
         child: Container(