diff --git a/modules/metastore/modules/metastore_search/src/FacetsFromContentTrait.php b/modules/metastore/modules/metastore_search/src/FacetsFromContentTrait.php
index df9a7cb960..dfbecbf5ca 100644
--- a/modules/metastore/modules/metastore_search/src/FacetsFromContentTrait.php
+++ b/modules/metastore/modules/metastore_search/src/FacetsFromContentTrait.php
@@ -130,11 +130,13 @@ private function getAllFacetsWithZeroCounts(array $facetsTypes) {
 
         $facet = isset($field) ? $facet->{"$.data." . $field} : $facet->{"$.data"};
 
-        $facets["{$type}:{$facet}"] = (object) [
-          'type' => $type,
-          'name' => $facet,
-          'total' => 0,
-        ];
+        if (!empty($facet)) {
+          $facets["{$type}:{$facet}"] = (object) [
+            'type' => $type,
+            'name' => $facet,
+            'total' => 0,
+          ];
+        }
       }
     }