diff --git a/modules/dkan_datastore/src/Service/Query.php b/modules/dkan_datastore/src/Service/Query.php
index 516b576ea2..797333448d 100644
--- a/modules/dkan_datastore/src/Service/Query.php
+++ b/modules/dkan_datastore/src/Service/Query.php
@@ -106,7 +106,7 @@ private function getSchema(DatastoreQuery $datastoreQuery) {
    */
   public function getQueryStorageMap(DatastoreQuery $datastoreQuery): array {
     $storageMap = [];
-    foreach ($datastoreQuery->{"$.resources"} as $resource) {
+    foreach ($datastoreQuery->{"$.resources"} ?? [] as $resource) {
       [$identifier, $version] = DataResource::getIdentifierAndVersion($resource["id"]);
       $storage = $this->datastore->getStorage($identifier, $version);
       $storageMap[$resource["alias"]] = $storage;