diff --git a/src/kafka-net/Producer.cs b/src/kafka-net/Producer.cs
index a86dde3d..c72dd3e4 100644
--- a/src/kafka-net/Producer.cs
+++ b/src/kafka-net/Producer.cs
@@ -126,7 +126,7 @@ public async Task<List<ProduceResponse>> SendMessageAsync(string topic, IEnumera
 
             _asyncCollection.AddRange(batch);
 
-            await Task.WhenAll(batch.Select(x => x.Tcs.Task));
+            await Task.WhenAll(batch.Select(x => x.Tcs.Task)).ConfigureAwait(false);
 
             return batch.Select(topicMessage => topicMessage.Tcs.Task.Result)
                                 .Distinct()