diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/JsrPartitionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/JsrPartitionHandler.java
index 780fc17c9..eb0ce0d25 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/JsrPartitionHandler.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/JsrPartitionHandler.java
@@ -178,7 +178,7 @@ public class JsrPartitionHandler implements PartitionHandler, InitializingBean {
 
 			processFinishedPartitions(tasks, result);
 
-			if(tasks.size() == 0) {
+			if(tasks.size() == 0 && partitionDataQueue.isEmpty()) {
 				break;
 			}
 		}