diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
index b0f877a25da..06fc05ff3c2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
@@ -93,7 +93,6 @@ public class FreeMarkerAutoConfiguration {
 	}
 
 	@Configuration
-	@ConditionalOnClass(Servlet.class)
 	@ConditionalOnNotWebApplication
 	public static class FreeMarkerConfiguration implements EnvironmentAware {
 
@@ -137,7 +136,7 @@ public class FreeMarkerAutoConfiguration {
 		}
 
 		@Bean
-		@ConditionalOnBean(FreeMarkerConfig.class)
+		@ConditionalOnBean(FreeMarkerConfigurer.class)
 		@ConditionalOnMissingBean
 		public freemarker.template.Configuration freemarkerConfiguration(
 				FreeMarkerConfig configurer) {