diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
index b857e6df448..60f918c6486 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/GsonHttpMessageConvertersConfiguration.java
@@ -36,10 +36,10 @@ import com.google.gson.Gson;
  * @since 1.2.2
  */
 @Configuration
+@ConditionalOnClass(Gson.class)
 class GsonHttpMessageConvertersConfiguration {
 
 	@Configuration
-	@ConditionalOnClass(Gson.class)
 	@ConditionalOnBean(Gson.class)
 	@Conditional(PreferGsonOrMissingJacksonCondition.class)
 	protected static class GsonHttpMessageConverterConfiguration {