diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java b/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java
index 6ba9e1d697cb..a6f704e596b6 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java
+++ b/sdk/cosmos/microsoft-azure-cosmos/src/main/java/com/azure/data/cosmos/internal/query/DocumentQueryExecutionContextFactory.java
@@ -55,7 +55,7 @@ public static <T extends Resource> Flux<? extends IDocumentQueryExecutionContext
 
         // return proxy
         Flux<DocumentCollection> collectionObs = Flux.empty();
-        
+
         if (resourceTypeEnum.isCollectionChild()) {
             collectionObs = resolveCollection(client, query, resourceTypeEnum, resourceLink).flux();
         }
@@ -108,8 +108,8 @@ public static <T extends Resource> Flux<? extends IDocumentQueryExecutionContext
 
         int initialPageSize = Utils.getValueOrDefault(feedOptions.maxItemCount(), ParallelQueryConfig.ClientInternalPageSize);
 
-        BadRequestException validationError = Utils.checkRequestOrReturnException
-                (initialPageSize > 0, "MaxItemCount", "INVALID MaxItemCount %s", initialPageSize);
+        BadRequestException validationError = Utils.checkRequestOrReturnException(
+            initialPageSize > 0 || initialPageSize == -1, "MaxItemCount", "Invalid MaxItemCount %s", initialPageSize);
         if (validationError != null) {
             return Flux.error(validationError);
         }
@@ -144,7 +144,7 @@ public static <T extends Resource> Flux<? extends IDocumentQueryExecutionContext
             //                initialPageSize = Math.Min(
             //                    (int)Math.Ceiling(initialPageSize / (double)targetRanges.Count) * PageSizeFactorForTop,
             //                    initialPageSize);
-            //            } 
+            //            }
         }
 
         return PipelinedDocumentQueryExecutionContext.createAsync(
@@ -160,6 +160,6 @@ public static <T extends Resource> Flux<? extends IDocumentQueryExecutionContext
                 initialPageSize,
                 isContinuationExpected,
                 getLazyFeedResponse,
-                correlatedActivityId);           
+                correlatedActivityId);
     }
 }
diff --git a/sdk/cosmos/microsoft-azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java b/sdk/cosmos/microsoft-azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java
index 0f8996e31132..863197e2f83d 100644
--- a/sdk/cosmos/microsoft-azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java
+++ b/sdk/cosmos/microsoft-azure-cosmos/src/test/java/com/azure/data/cosmos/rx/MultiMasterConflictResolutionTest.java
@@ -104,18 +104,19 @@ public void conflictResolutionPolicyCRUD() {
         }
 
         // Tests the following scenarios
-        // 1. CUSTOM with valid sprocLink
-        // 2. CUSTOM with null sprocLink, should default to empty string
-        // 3. CUSTOM with empty sprocLink, should default to empty string
-        testConflictResolutionPolicyRequiringPath(ConflictResolutionMode.CUSTOM,
-                new String[] { "randomSprocName", null, "" }, new String[] { "randomSprocName", "", "" });
+        // 1. Custom with valid sprocLink
+        // 2. Custom with null sprocLink, should default to empty string
+        // 3. Custom with empty sprocLink, should default to empty string
+        testConflictResolutionPolicyRequiringPath(ConflictResolutionMode.CUSTOM, new String[] { "dbs/mydb/colls" +
+            "/mycoll/sprocs/randomSprocName", null, "" }, new String[] { "dbs/mydb/colls/mycoll/sprocs" +
+            "/randomSprocName", "", "" });
     }
 
     private void testConflictResolutionPolicyRequiringPath(ConflictResolutionMode conflictResolutionMode,
             String[] paths, String[] expectedPaths) {
-        for (int i = 0; i < paths.length; i++) {            
+        for (int i = 0; i < paths.length; i++) {
             CosmosContainerProperties collectionSettings = new CosmosContainerProperties(UUID.randomUUID().toString(), partitionKeyDef);
-            
+
             if (conflictResolutionMode == ConflictResolutionMode.LAST_WRITER_WINS) {
                 collectionSettings.conflictResolutionPolicy(ConflictResolutionPolicy.createLastWriterWinsPolicy(paths[i]));
             } else {
@@ -123,7 +124,7 @@ private void testConflictResolutionPolicyRequiringPath(ConflictResolutionMode co
             }
             collectionSettings = database.createContainer(collectionSettings, new CosmosContainerRequestOptions()).block().properties();
             assertThat(collectionSettings.conflictResolutionPolicy().mode()).isEqualTo(conflictResolutionMode);
-            
+
             if (conflictResolutionMode == ConflictResolutionMode.LAST_WRITER_WINS) {
                 assertThat(collectionSettings.conflictResolutionPolicy().conflictResolutionPath()).isEqualTo(expectedPaths[i]);
             } else {
@@ -131,7 +132,7 @@ private void testConflictResolutionPolicyRequiringPath(ConflictResolutionMode co
             }
         }
     }
-    
+
     @Test(groups = "multi-master", timeOut = TIMEOUT)
     public void invalidConflictResolutionPolicy_LastWriterWinsWithStoredProc() throws Exception {
         CosmosContainerProperties collection = new CosmosContainerProperties(UUID.randomUUID().toString(), partitionKeyDef);