diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
index d5f9a9f386..697165c571 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java
@@ -136,7 +136,7 @@ public class FileReadingMessageSource implements MessageSource<File> {
 	public Message<File> receive() throws MessagingException {
 		Message<File> message = null;
 		// rescan only if needed or explicitly configured
-		if (toBeReceived.isEmpty() || scanEachPoll) {
+		if (scanEachPoll || toBeReceived.isEmpty()) {
 			scanInputDirectory();
 		}
 		File file = toBeReceived.poll();