diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
index a2b3a0ee9..5f610b57e 100644
--- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
+++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/RabbitMessageChannelBinder.java
@@ -252,7 +252,7 @@ public class RabbitMessageChannelBinder extends
 		super.onInit();
 		if (this.clustered) {
 			String[] addresses = StringUtils.commaDelimitedListToStringArray(
-					this.rabbitProperties.getAddresses());
+				StringUtils.collectionToDelimitedString(this.rabbitProperties.getAddresses(), ","));
 
 			Assert.state(
 					addresses.length == this.adminAddresses.length
diff --git a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java
index 9a6a92ed3..62565ef24 100644
--- a/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java
+++ b/binders/rabbit-binder/spring-cloud-stream-binder-rabbit/src/main/java/org/springframework/cloud/stream/binder/rabbit/config/RabbitBinderConfiguration.java
@@ -72,8 +72,9 @@ public class RabbitBinderConfiguration {
 			ConfigurableApplicationContext applicationContext,
 			RabbitProperties rabbitProperties) throws Exception {
 
-		if (StringUtils.hasText(rabbitProperties.getAddresses())) {
-			connectionFactory.setAddresses(rabbitProperties.determineAddresses());
+		String addressesText = StringUtils.collectionToDelimitedString(rabbitProperties.getAddresses(), ",");
+		if (StringUtils.hasText(addressesText)) {
+			connectionFactory.setAddresses(addressesText);
 		}
 
 		connectionFactory.setPublisherConfirmType(rabbitProperties.getPublisherConfirmType() == null ? ConfirmType.NONE : rabbitProperties.getPublisherConfirmType());