diff --git a/modules/metastore/modules/metastore_search/src/ComplexData/Dataset.php b/modules/metastore/modules/metastore_search/src/ComplexData/Dataset.php
index 7f6de9c78e..a4b80c4ba5 100644
--- a/modules/metastore/modules/metastore_search/src/ComplexData/Dataset.php
+++ b/modules/metastore/modules/metastore_search/src/ComplexData/Dataset.php
@@ -165,7 +165,9 @@ private function getArrayValues($property_name) {
       && isset($this->data->{$matches[1]})
       && is_array($this->data->{$matches[1]})) {
       foreach ($this->data->{$matches[1]} as $dist) {
-        $values[] = $dist->{$matches[2]} ?? [];
+        if (isset($dist->{$matches[2]})) {
+          $values[] = $dist->{$matches[2]};
+        }
       }
     }
     elseif (isset($this->data->{$property_name})) {