diff --git a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java
index 540d63b19..6323d265d 100644
--- a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java
+++ b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBindingInformationCatalogue.java
@@ -105,7 +105,9 @@ class KafkaStreamsBindingInformationCatalogue {
 	 */
 	void registerBindingProperties(KStream<?, ?> bindingTarget,
 			BindingProperties bindingProperties) {
-		this.bindingProperties.put(bindingTarget, bindingProperties);
+		if (bindingProperties != null) {
+			this.bindingProperties.put(bindingTarget, bindingProperties);
+		}
 	}
 
 	/**
@@ -115,7 +117,9 @@ class KafkaStreamsBindingInformationCatalogue {
 	 */
 	void registerConsumerProperties(KStream<?, ?> bindingTarget,
 			KafkaStreamsConsumerProperties kafkaStreamsConsumerProperties) {
-		this.consumerProperties.put(bindingTarget, kafkaStreamsConsumerProperties);
+		if (kafkaStreamsConsumerProperties != null) {
+			this.consumerProperties.put(bindingTarget, kafkaStreamsConsumerProperties);
+		}
 	}
 
 	/**