diff --git a/lib/pages/routines/widgets/dragable_card.dart b/lib/pages/routines/widgets/dragable_card.dart
index 039732b0..7395d2d6 100644
--- a/lib/pages/routines/widgets/dragable_card.dart
+++ b/lib/pages/routines/widgets/dragable_card.dart
@@ -120,7 +120,7 @@ class DraggableCard extends StatelessWidget {
                       height: 4,
                     ),
                     Visibility(
-                      visible: deviceData['tag'] != null,
+                      visible: deviceData['tag'] != null && deviceData['tag'] != '',
                       child: Row(
                         spacing: 2,
                         children: [
@@ -143,13 +143,13 @@ class DraggableCard extends StatelessWidget {
                       ),
                     ),
                     Visibility(
-                      visible: deviceData['subSpace'] != null || deviceData['subSpace'] != '',
+                      visible: deviceData['subSpace'] != null && deviceData['subSpace'] != '',
                       child: const SizedBox(
                         height: 4,
                       ),
                     ),
                     Visibility(
-                      visible: deviceData['subSpace'] != null || deviceData['subSpace'] != '',
+                      visible: deviceData['subSpace'] != null && deviceData['subSpace'] != '',
                       child: Row(
                         spacing: 2,
                         children: [