diff --git a/src/Microsoft.Restier.AspNet/Batch/RestierBatchChangeSetRequestItem.cs b/src/Microsoft.Restier.AspNet/Batch/RestierBatchChangeSetRequestItem.cs
index e961e0ec..3d659ce4 100644
--- a/src/Microsoft.Restier.AspNet/Batch/RestierBatchChangeSetRequestItem.cs
+++ b/src/Microsoft.Restier.AspNet/Batch/RestierBatchChangeSetRequestItem.cs
@@ -95,7 +95,10 @@ public override async Task<ODataBatchResponseItem> SendRequestAsync(
             // - the ChangeSet is submitted
             // - the responses are created and
             // - the controller actions have returned
-            await Task.WhenAll(responseTasks).ConfigureAwait(false);
+            foreach (var responseTask in responseTasks)
+            {
+                await responseTask.ConfigureAwait(false);
+            }
 
             var responses = new List<HttpResponseMessage>();
             try
diff --git a/src/Microsoft.Restier.AspNetCore/Batch/RestierBatchChangeSetRequestItem.cs b/src/Microsoft.Restier.AspNetCore/Batch/RestierBatchChangeSetRequestItem.cs
index 857389c4..f7663e16 100644
--- a/src/Microsoft.Restier.AspNetCore/Batch/RestierBatchChangeSetRequestItem.cs
+++ b/src/Microsoft.Restier.AspNetCore/Batch/RestierBatchChangeSetRequestItem.cs
@@ -94,7 +94,10 @@ public override async Task<ODataBatchResponseItem> SendRequestAsync(RequestDeleg
             // - the ChangeSet is submitted
             // - the responses are created and
             // - the controller actions have returned
-            await Task.WhenAll(responseTasks).ConfigureAwait(false);
+            foreach (var responseTask in responseTasks)
+            {
+                await responseTask.ConfigureAwait(false);
+            }
 
             var returnContexts = new List<HttpContext>();