diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
index 79b57cd648c..209dcf00adc 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -1386,7 +1386,7 @@ public class SpringApplication {
 			return action.get();
 		}
 		finally {
-			applicationHook.set(null);
+			applicationHook.remove();
 		}
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java
index 578e300dbc4..c437126a0ca 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/CharSequenceToObjectConverter.java
@@ -68,7 +68,7 @@ class CharSequenceToObjectConverter implements ConditionalGenericConverter {
 			return this.conversionService.canConvert(STRING, targetType);
 		}
 		finally {
-			this.disable.set(null);
+			this.disable.remove();
 		}
 	}