diff --git a/src/Service/UWService.php b/src/Service/UWService.php
index 0ee6ac6f11ab457d30b5a80026e1f48d11f5c20e..598b191b3b7b9dca960696cc02dd0e19dc859c04 100644
--- a/src/Service/UWService.php
+++ b/src/Service/UWService.php
@@ -417,7 +417,11 @@ class UWService implements UWServiceInterface {
             if (!empty($tabs)) {
               foreach ($data as $key => $field) {
                 if (in_array($key, $tabs)) {
-                  $tags[$key] = $this->uwGetTermsFromEntityField($node->$field, 'tags');
+                  $tags_to_add = $this->uwGetTermsFromEntityField($node->$field, 'tags');
+
+                  if (!empty($tags_to_add)) {
+                    $tags[$key] = $this->uwGetTermsFromEntityField($node->$field, 'tags');
+                  }
                 }
               }
             }
@@ -428,6 +432,7 @@ class UWService implements UWServiceInterface {
           case 'tags':
             $tags = [];
             foreach ($data as $field) {
+              $tags_to_add = $this->uwGetTermsFromEntityField($node->$field, 'tags');
               $tags = array_merge($tags, $this->uwGetTermsFromEntityField($node->$field, 'tags'));
             }
             $node_data[$index] = [$tags];