diff --git a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
index 888f8e6b2b0..b06d5b228a4 100644
--- a/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
+++ b/spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -200,8 +200,8 @@ public abstract class AbstractJmsListenerContainerFactory<C extends AbstractMess
 			instance.setAutoStartup(this.autoStartup);
 		}
 
-		endpoint.setupListenerContainer(instance);
 		initializeContainer(instance);
+		endpoint.setupListenerContainer(instance);
 
 		return instance;
 	}
diff --git a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
index e6f43232849..3f4fd42c6a5 100644
--- a/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -149,6 +149,21 @@ public class JmsListenerContainerFactoryTests {
 		assertSame(backOff, new DirectFieldAccessor(container).getPropertyValue("backOff"));
 	}
 
+	@Test
+	public void endpointConcurrencyTakesPrecedence() {
+		DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
+		factory.setConcurrency("2-10");
+
+		SimpleJmsListenerEndpoint endpoint = new SimpleJmsListenerEndpoint();
+		MessageListener messageListener = new MessageListenerAdapter();
+		endpoint.setMessageListener(messageListener);
+		endpoint.setDestination("myQueue");
+		endpoint.setConcurrency("4-6");
+		DefaultMessageListenerContainer container = factory.createListenerContainer(endpoint);
+		assertEquals(4, container.getConcurrentConsumers());
+		assertEquals(6, container.getMaxConcurrentConsumers());
+	}
+
 
 	private void setDefaultJmsConfig(AbstractJmsListenerContainerFactory<?> factory) {
 		factory.setConnectionFactory(connectionFactory);