diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
index 2a2172fa4a..049a720007 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
@@ -201,7 +201,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
 			taskExecutor.execute(new Runnable() {
 				public void run() {
 					int count = 0;
-					while (maxMessagesPerPoll <= 0 || count < maxMessagesPerPoll) {
+					while (initialized && (maxMessagesPerPoll <= 0 || count < maxMessagesPerPoll)) {
 						try {
 							if (!pollingTask.call()) {
 								break;