diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java
index 5b1b1d35e2..558e1f24b9 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceAutoConfigure.java
@@ -57,7 +57,7 @@ public class DruidDataSourceAutoConfigure {
             dataSource.setDriverClassName(env.getProperty("spring.datasource.driver-class-name"));
         }
         // set filters default value on StatViewServlet enabled.
-        if (! "false".equals(env.getProperty("spring.datasource.druid.StatViewServlet.enabled"))) {
+        if (!"false".equals(env.getProperty("spring.datasource.druid.stat-view-servlet.enabled"))) {
             try {
                 dataSource.setFilters("stat");
             } catch (SQLException e) {
diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatProperties.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatProperties.java
index 0f4c28c152..dff025c749 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatProperties.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatProperties.java
@@ -52,6 +52,7 @@ public class DruidStatProperties {
     }
 
     public static class StatViewServlet {
+        private boolean enabled;
         private String urlPattern;
         private String allow;
         private String deny;
@@ -59,6 +60,14 @@ public class DruidStatProperties {
         private String loginPassword;
         private String resetEnable;
 
+        public boolean isEnabled() {
+            return enabled;
+        }
+
+        public void setEnabled(boolean enabled) {
+            this.enabled = enabled;
+        }
+
         public String getUrlPattern() {
             return urlPattern;
         }
@@ -109,6 +118,7 @@ public class DruidStatProperties {
     }
 
     public static class WebStatFilter {
+        private boolean enabled;
         private String urlPattern;
         private String exclusions;
         private String sessionStatMaxCount;
@@ -117,6 +127,14 @@ public class DruidStatProperties {
         private String principalCookieName;
         private String profileEnable;
 
+        public boolean isEnabled() {
+            return enabled;
+        }
+
+        public void setEnabled(boolean enabled) {
+            this.enabled = enabled;
+        }
+
         public String getUrlPattern() {
             return urlPattern;
         }
diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatViewServletConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatViewServletConfiguration.java
index 14e787fd86..25eb4e4b72 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatViewServletConfiguration.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidStatViewServletConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
  * @author lihengming [89921218@qq.com]
  */
 @ConditionalOnWebApplication
-@ConditionalOnProperty(name = "spring.datasource.druid.StatViewServlet.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = {"spring.datasource.druid.stat-view-servlet.enabled"}, havingValue = "true", matchIfMissing = true)
 public class DruidStatViewServletConfiguration {
     @Bean
     public ServletRegistrationBean servletRegistrationBean(DruidStatProperties properties) {
diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidWebStatFilterConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidWebStatFilterConfiguration.java
index 3f3a539a93..85be259ef6 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidWebStatFilterConfiguration.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidWebStatFilterConfiguration.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
  * @author lihengming [89921218@qq.com]
  */
 @ConditionalOnWebApplication
-@ConditionalOnProperty(name = "spring.datasource.druid.WebStatFilter.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(name = "spring.datasource.druid.web-stat-filter.enabled", havingValue = "true", matchIfMissing = true)
 public class DruidWebStatFilterConfiguration {
     @Bean
     public FilterRegistrationBean filterRegistrationBean(DruidStatProperties properties) {