diff --git a/include/cppkafka/utils/buffered_producer.h b/include/cppkafka/utils/buffered_producer.h
index a47f8e8..c717cc5 100644
--- a/include/cppkafka/utils/buffered_producer.h
+++ b/include/cppkafka/utils/buffered_producer.h
@@ -169,7 +169,6 @@ void BufferedProducer<BufferType>::flush() {
 
 template <typename BufferType>
 void BufferedProducer<BufferType>::wait_for_acks() {
-    messages_acked_ = 0;
     while (messages_acked_ < expected_acks_) {
         try {
             producer_.flush();
@@ -185,6 +184,7 @@ void BufferedProducer<BufferType>::wait_for_acks() {
         }
     }
     expected_acks_ = 0;
+    messages_acked_ = 0;
 }
 
 template <typename BufferType>