diff --git a/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaProperties.java b/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaProperties.java
index d622810b5fe..9f66725b7d1 100644
--- a/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaProperties.java
+++ b/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaProperties.java
@@ -812,6 +812,11 @@ public class KafkaProperties {
 		 */
 		private @Nullable String stateDir;
 
+		/**
+		 * Whether the consumer should leave the group when stopping Kafka Streams.
+		 */
+		private boolean leaveGroupOnClose;
+
 		/**
 		 * Additional Kafka properties used to configure the streams.
 		 */
@@ -885,6 +890,14 @@ public class KafkaProperties {
 			this.stateDir = stateDir;
 		}
 
+		public boolean isLeaveGroupOnClose() {
+			return this.leaveGroupOnClose;
+		}
+
+		public void setLeaveGroupOnClose(boolean leaveGroupOnClose) {
+			this.leaveGroupOnClose = leaveGroupOnClose;
+		}
+
 		public Map<String, String> getProperties() {
 			return this.properties;
 		}
diff --git a/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaStreamsAnnotationDrivenConfiguration.java b/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaStreamsAnnotationDrivenConfiguration.java
index 1c718496006..410d7206725 100644
--- a/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaStreamsAnnotationDrivenConfiguration.java
+++ b/module/spring-boot-kafka/src/main/java/org/springframework/boot/kafka/autoconfigure/KafkaStreamsAnnotationDrivenConfiguration.java
@@ -101,6 +101,7 @@ class KafkaStreamsAnnotationDrivenConfiguration {
 			KafkaProperties.Cleanup cleanup = this.properties.getStreams().getCleanup();
 			CleanupConfig cleanupConfig = new CleanupConfig(cleanup.isOnStartup(), cleanup.isOnShutdown());
 			factoryBean.setCleanupConfig(cleanupConfig);
+			factoryBean.setLeaveGroupOnClose(this.properties.getStreams().isLeaveGroupOnClose());
 		}
 
 		@Override