diff --git a/src/producer/base_producer.rs b/src/producer/base_producer.rs
index 2a503e65d..d2daf493a 100644
--- a/src/producer/base_producer.rs
+++ b/src/producer/base_producer.rs
@@ -505,6 +505,8 @@ where
             };
             if ret.is_error() {
                 return Err(KafkaError::Flush(ret.into()));
+            } else if let Deadline::Never = &deadline {
+                self.poll(Timeout::After(Duration::ZERO));
             } else {
                 self.poll(&deadline);
             }