diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java
index c9fe157da3..b89bec30b6 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/config/ConsumerEndpointFactoryBean.java
@@ -145,6 +145,7 @@ public class ConsumerEndpointFactoryBean implements FactoryBean, ChannelRegistry
 			MessageChannel channel = (MessageChannel)
 					this.beanFactory.getBean(this.inputChannelName, MessageChannel.class);
 			if (channel instanceof SubscribableChannel) {
+				Assert.isNull(trigger, "A trigger should not be specified when using a SubscribableChannel");
 				this.endpoint = new SubscribingConsumerEndpoint(
 						this.consumer, (SubscribableChannel) channel);
 			}