diff --git a/src/main/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapter.java b/src/main/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapter.java
index b7251f7..546a795 100644
--- a/src/main/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapter.java
+++ b/src/main/java/org/springframework/integration/aws/inbound/SqsMessageDrivenChannelAdapter.java
@@ -45,6 +45,7 @@ import com.amazonaws.services.sqs.AmazonSQSAsync;
  * Works in 'listener' manner and delegates hard to the {@link SimpleMessageListenerContainer}.
  *
  * @author Artem Bilan
+ * @author Patrick Fitzsimons
  *
  * @see SimpleMessageListenerContainerFactory
  * @see SimpleMessageListenerContainer
@@ -88,6 +89,12 @@ public class SqsMessageDrivenChannelAdapter extends MessageProducerSupport
 		this.simpleMessageListenerContainerFactory.setResourceIdResolver(resourceIdResolver);
 	}
 
+	@Override
+	public void setAutoStartup(boolean autoStartUp) {
+		super.setAutoStartup(autoStartUp);
+		this.simpleMessageListenerContainerFactory.setAutoStartup(autoStartUp);
+	}
+
 	public void setDestinationResolver(DestinationResolver<String> destinationResolver) {
 		this.simpleMessageListenerContainerFactory.setDestinationResolver(destinationResolver);
 	}
diff --git a/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java b/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java
index 114fdf1..25c2a6c 100644
--- a/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java
+++ b/src/test/java/org/springframework/integration/aws/config/xml/SqsMessageDrivenChannelAdapterParserTests.java
@@ -45,6 +45,7 @@ import com.amazonaws.services.sqs.AmazonSQS;
 
 /**
  * @author Artem Bilan
+ * @author Patrick Fitzsimons
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -95,6 +96,7 @@ public class SqsMessageDrivenChannelAdapterParserTests {
 		assertThat(TestUtils.getPropertyValue(listenerContainer, "maxNumberOfMessages")).isEqualTo(5);
 		assertThat(TestUtils.getPropertyValue(listenerContainer, "visibilityTimeout")).isEqualTo(200);
 		assertThat(TestUtils.getPropertyValue(listenerContainer, "waitTimeOut")).isEqualTo(40);
+		assertThat(TestUtils.getPropertyValue(listenerContainer, "autoStartup")).isEqualTo(false);
 
 		@SuppressWarnings("rawtypes")
 		Map queues = TestUtils.getPropertyValue(listenerContainer, "registeredQueues", Map.class);