diff --git a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
index e4b53ab9feb..a036b8f2958 100644
--- a/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
+++ b/external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpout.java
@@ -267,7 +267,7 @@ private boolean poll() {
             //Accounting for retriable tuples this way still guarantees that the limit is followed on a per partition basis,
             //and prevents locking up the spout when there are too many retriable tuples
             && (numUncommittedOffsets - readyMessageCount < maxUncommittedOffsets
-            || consumerAutoCommitMode);
+            || consumerAutoCommitMode || readyMessageCount >= maxUncommittedOffsets);
         
         if (!poll) {
             if (waitingToEmit()) {