diff --git a/api/src/main/java/org/cardanofoundation/tokenmetadata/registry/api/controller/MetadataApiController.java b/api/src/main/java/org/cardanofoundation/tokenmetadata/registry/api/controller/MetadataApiController.java
index 1122ea7..fc19da5 100644
--- a/api/src/main/java/org/cardanofoundation/tokenmetadata/registry/api/controller/MetadataApiController.java
+++ b/api/src/main/java/org/cardanofoundation/tokenmetadata/registry/api/controller/MetadataApiController.java
@@ -33,7 +33,7 @@ public ResponseEntity<BatchResponse> getSubjects(final BatchRequest body) {
             } else {
                 final Map<String, TokenMetadata> subjects = v1ApiMetadataIndexer.findSubjectsSelectProperties(
                         body.getSubjects(),
-                        body.getProperties());
+                        body.getProperties() == null ? List.of() : body.getProperties());
                 if (subjects.isEmpty()) {
                     return new ResponseEntity<>(HttpStatus.NO_CONTENT);
                 } else {