diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
index 3a7b387ec5..8b1ec9251b 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
@@ -32,7 +32,6 @@ import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.MessageHandler;
-import org.springframework.integration.scheduling.IntervalTrigger;
 import org.springframework.integration.scheduling.Trigger;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
@@ -158,9 +157,6 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, BeanFactoryAwar
 				this.endpoint = new EventDrivenConsumer((SubscribableChannel) channel, this.handler);
 			}
 			else if (channel instanceof PollableChannel) {
-				if (this.trigger == null) {
-					this.trigger = new IntervalTrigger(0);
-				}
 				PollingConsumer pollingConsumer = new PollingConsumer(
 						(PollableChannel) channel, this.handler);
 				pollingConsumer.setTrigger(this.trigger);
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
index abb92128d8..a6c5f134c0 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
@@ -138,7 +138,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement
 				return;
 			}
 			if (this.trigger == null) {
-				this.trigger = new IntervalTrigger(0);
+				this.trigger = new IntervalTrigger(10);
 			}
 			if (this.transactionManager != null) {
 				if (this.transactionDefinition == null) {
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
index 9c83b1d3b8..3d0237b459 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
@@ -12,9 +12,9 @@
 	</si:channel>
 
 	<bean id="testEndpoint" class="org.springframework.integration.endpoint.PollingEndpointStub">
-		<property name="taskExecutor" ref="taskExecutor" />
+		<property name="taskExecutor" ref="taskExecutor"/>
 	</bean>
 
-	<si:thread-pool-task-executor id="taskExecutor" core-size="1" max-size="5" rejection-policy="CALLER_RUNS"/>
+	<si:thread-pool-task-executor id="taskExecutor" core-size="1" max-size="1" rejection-policy="CALLER_RUNS"/>
 
 </beans>