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 19bdf64f..b3f3d978 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,106 +40,108 @@ class TagChipDisplay extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return (spaceModel?.tags?.isNotEmpty == true ||
-            spaceModel?.subspaceModels
-                    ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
-                true)
-        ? SizedBox(
-            width: screenWidth * 0.25,
-            child: Container(
-              padding: const EdgeInsets.all(8.0),
-              decoration: BoxDecoration(
-                color: ColorsManager.textFieldGreyColor,
-                borderRadius: BorderRadius.circular(15),
-                border: Border.all(
-                  color: ColorsManager.textFieldGreyColor,
-                  width: 3.0,
-                ),
-              ),
-              child: Wrap(
-                spacing: 8.0,
-                runSpacing: 8.0,
-                children: [
-                  ...TagHelper.groupTags([
-                    ...?spaceModel?.tags,
-                    ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
-                  ]).entries.map(
-                        (entry) => Chip(
-                          avatar: SizedBox(
-                            width: 24,
-                            height: 24,
-                            child: SvgPicture.asset(
-                              entry.key.icon ?? 'assets/icons/gateway.svg',
-                              fit: BoxFit.contain,
-                            ),
-                          ),
-                          label: Text(
-                            'x${entry.value}',
-                            style: context.textTheme.bodySmall!.copyWith(
-                              color: ColorsManager.spaceColor,
-                            ),
-                          ),
-                          backgroundColor: ColorsManager.whiteColors,
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(16),
-                            side: const BorderSide(
-                              color: ColorsManager.spaceColor,
-                            ),
-                          ),
+    if ((spaceModel?.tags?.isNotEmpty == true ||
+        spaceModel?.subspaceModels
+                ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
+            true)) {
+      return SizedBox(
+        width: screenWidth * 0.25,
+        child: Container(
+          padding: const EdgeInsets.all(8.0),
+          decoration: BoxDecoration(
+            color: ColorsManager.textFieldGreyColor,
+            borderRadius: BorderRadius.circular(15),
+            border: Border.all(
+              color: ColorsManager.textFieldGreyColor,
+              width: 3.0,
+            ),
+          ),
+          child: Wrap(
+            spacing: 8.0,
+            runSpacing: 8.0,
+            children: [
+              ...TagHelper.groupTags([
+                ...?spaceModel?.tags,
+                ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
+              ]).entries.map(
+                    (entry) => Chip(
+                      avatar: SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: SvgPicture.asset(
+                          entry.key.icon ?? 'assets/icons/gateway.svg',
+                          fit: BoxFit.contain,
                         ),
                       ),
-                  EditChip(
-                    onTap: () => showDialog<bool>(
-                      context: context,
-                      builder: (context) => AssignTagModelsDialog(
-                        products: products,
-                        allSpaceModels: allSpaceModels,
-                        subspaces: subspaces,
-                        pageContext: pageContext,
-                        allTags: allTags,
-                        spaceModel: spaceModel,
-                        otherSpaceModels: otherSpaceModels,
-                        initialTags: TagHelper.generateInitialTags(
-                            subspaces: subspaces,
-                            spaceTagModels: spaceModel?.tags ?? []),
-                        title: 'Edit Device',
-                        addedProducts: TagHelper.createInitialSelectedProducts(
-                          spaceModel?.tags ?? [],
-                          subspaces,
+                      label: Text(
+                        'x${entry.value}',
+                        style: context.textTheme.bodySmall!.copyWith(
+                          color: ColorsManager.spaceColor,
+                        ),
+                      ),
+                      backgroundColor: ColorsManager.whiteColors,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(16),
+                        side: const BorderSide(
+                          color: ColorsManager.spaceColor,
                         ),
-                        spaceName: spaceModel?.modelName ?? '',
-                        projectTags: projectTags,
                       ),
                     ),
                   ),
-                ],
-              ),
-            ),
-          )
-        : TextButton(
-            onPressed: () {
-              showDialog<void>(
-                context: context,
-                builder: (context) => AddDeviceTypeModelWidget(
-                  products: products,
-                  subspaces: subspaces,
-                  allTags: allTags,
-                  spaceName: spaceNameController.text,
-                  pageContext: pageContext,
-                  isCreate: true,
-                  spaceModel: spaceModel,
-                  otherSpaceModels: otherSpaceModels,
-                  projectTags: projectTags,
+              EditChip(
+                onTap: () => showDialog<bool>(
+                  context: context,
+                  builder: (context) => AssignTagModelsDialog(
+                    products: products,
+                    allSpaceModels: allSpaceModels,
+                    subspaces: subspaces,
+                    pageContext: pageContext,
+                    allTags: allTags,
+                    spaceModel: spaceModel,
+                    otherSpaceModels: otherSpaceModels,
+                    initialTags: TagHelper.generateInitialTags(
+                        subspaces: subspaces,
+                        spaceTagModels: spaceModel?.tags ?? []),
+                    title: 'Edit Device',
+                    addedProducts: TagHelper.createInitialSelectedProducts(
+                      spaceModel?.tags ?? [],
+                      subspaces,
+                    ),
+                    spaceName: spaceModel?.modelName ?? '',
+                    projectTags: projectTags,
+                  ),
                 ),
-              );
-            },
-            style: TextButton.styleFrom(
-              padding: EdgeInsets.zero,
-            ),
-            child: const ButtonContentWidget(
-              icon: Icons.add,
-              label: 'Add Devices',
+              ),
+            ],
+          ),
+        ),
+      );
+    } else {
+      return TextButton(
+        onPressed: () {
+          showDialog<void>(
+            context: context,
+            builder: (context) => AddDeviceTypeModelWidget(
+              products: products,
+              subspaces: subspaces,
+              allTags: allTags,
+              spaceName: spaceNameController.text,
+              pageContext: pageContext,
+              isCreate: true,
+              spaceModel: spaceModel,
+              otherSpaceModels: otherSpaceModels,
+              projectTags: projectTags,
             ),
           );
+        },
+        style: TextButton.styleFrom(
+          padding: EdgeInsets.zero,
+        ),
+        child: const ButtonContentWidget(
+          icon: Icons.add,
+          label: 'Add Devices',
+        ),
+      );
+    }
   }
 }