diff --git a/src/Utils/QueryUtils.test.ts b/src/Utils/QueryUtils.test.ts
index f59ee4189..86a0b264a 100644
--- a/src/Utils/QueryUtils.test.ts
+++ b/src/Utils/QueryUtils.test.ts
@@ -108,6 +108,7 @@ describe("Query Utils", () => {
       },
       Elevation: 3742,
       Type: "Stratovolcano",
+      Category: "",
       Status: "Tephrochronology",
       "Last Known Eruption": "Last known eruption from A.D. 1-1499, inclusive",
       id: "9e3c494e-8367-3f50-1f56-8c6fcb961363",
@@ -147,18 +148,20 @@ describe("Query Utils", () => {
       expect(expectedPartitionKeyValues).toContain(documentContent["Status"]);
     });
 
-    it("should extract no partition key values", () => {
-      const singlePartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.Hash,
-        paths: ["/InvalidPartitionKeyPath"],
+    it("should extract three partition key values", () => {
+      const multiPartitionKeyDefinition: PartitionKeyDefinition = {
+        kind: PartitionKeyKind.MultiHash,
+        paths: ["/Country", "/Region", "/Category"],
       };
-
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
+      const expectedPartitionKeyValues: string[] = ["United States", "US-Washington", ""];
+      const partitioinKeyValues: PartitionKey[] = extractPartitionKeyValues(
         documentContent,
-        singlePartitionKeyDefinition,
+        multiPartitionKeyDefinition,
       );
-
-      expect(partitionKeyValues.length).toBe(0);
+      expect(partitioinKeyValues.length).toBe(3);
+      expect(expectedPartitionKeyValues).toContain(documentContent["Country"]);
+      expect(expectedPartitionKeyValues).toContain(documentContent["Region"]);
+      expect(expectedPartitionKeyValues).toContain(documentContent["Category"]);
     });
   });
 });
diff --git a/src/Utils/QueryUtils.ts b/src/Utils/QueryUtils.ts
index 5440c2dda..59276077d 100644
--- a/src/Utils/QueryUtils.ts
+++ b/src/Utils/QueryUtils.ts
@@ -96,9 +96,7 @@ export const extractPartitionKeyValues = (
   const partitionKeyValues: PartitionKey[] = [];
   partitionKeyDefinition.paths.forEach((partitionKeyPath: string) => {
     const partitionKeyPathWithoutSlash: string = partitionKeyPath.substring(1);
-    if (documentContent[partitionKeyPathWithoutSlash]) {
-      partitionKeyValues.push(documentContent[partitionKeyPathWithoutSlash]);
-    }
+    partitionKeyValues.push(documentContent[partitionKeyPathWithoutSlash]);
   });
   return partitionKeyValues;
 };