diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
index e76dd85de20..be9f8668a3f 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
@@ -1264,7 +1264,7 @@ public class KafkaProperties {
 		/**
 		 * Cleanup the application’s local state directory on shutdown.
 		 */
-		private boolean onShutdown = false;
+		private boolean onShutdown = true;
 
 		public boolean isOnStartup() {
 			return this.onStartup;
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
index 5697f03aa45..083ae6b9519 100644
--- a/spring-boot-project/spring-boot-dependencies/build.gradle
+++ b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -1649,7 +1649,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Kafka", "2.7.0-SNAPSHOT") {
+	library("Spring Kafka", "2.7.0-RC1") {
 		group("org.springframework.kafka") {
 			modules = [
 				"spring-kafka",