diff --git a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java
index 9790ffb68..0d43aabe4 100644
--- a/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java
+++ b/binders/kafka-binder/spring-cloud-stream-binder-kafka/src/main/java/org/springframework/cloud/stream/binder/kafka/config/KafkaBinderConfiguration.java
@@ -169,20 +169,23 @@ public class KafkaBinderConfiguration {
 	public KafkaJaasLoginModuleInitializer jaasInitializer(
 			KafkaBinderConfigurationProperties configurationProperties)
 			throws IOException {
-		KafkaJaasLoginModuleInitializer kafkaJaasLoginModuleInitializer = new KafkaJaasLoginModuleInitializer();
 		JaasLoginModuleConfiguration jaas = configurationProperties.getJaas();
-		if (jaas != null) {
+		if (jaas == null) {
+			return null;
+		}
+		else {
+			KafkaJaasLoginModuleInitializer kafkaJaasLoginModuleInitializer = new KafkaJaasLoginModuleInitializer();
 			kafkaJaasLoginModuleInitializer.setLoginModule(jaas.getLoginModule());
 
 			KafkaJaasLoginModuleInitializer.ControlFlag controlFlag = jaas
-					.getControlFlag();
+				.getControlFlag();
 
 			if (controlFlag != null) {
 				kafkaJaasLoginModuleInitializer.setControlFlag(controlFlag);
 			}
 			kafkaJaasLoginModuleInitializer.setOptions(jaas.getOptions());
+			return kafkaJaasLoginModuleInitializer;
 		}
-		return kafkaJaasLoginModuleInitializer;
 	}
 
 	@Configuration(proxyBeanMethods = false)