diff --git a/ruoyi-admin/src/test/java/org/dromara/test/SmsPropertiesTest.java b/ruoyi-admin/src/test/java/org/dromara/test/SmsPropertiesTest.java
index 0c5c51ee1..feb3a03e4 100644
--- a/ruoyi-admin/src/test/java/org/dromara/test/SmsPropertiesTest.java
+++ b/ruoyi-admin/src/test/java/org/dromara/test/SmsPropertiesTest.java
@@ -47,13 +47,13 @@ public class SmsPropertiesTest {
     }
 
     @Tag("dev")
-    @DisplayName("sms.enabled=false 时不创建 PlusSmsDao / SmsExceptionHandler")
+    @DisplayName("sms.enabled=false 时仍注册 SmsDao,但不创建 SmsExceptionHandler")
     @Test
-    public void shouldNotCreateSmsBeansWhenDisabled() {
+    public void shouldAlwaysRegisterSmsDaoButOmitHandlerWhenDisabled() {
         contextRunner
             .withPropertyValues("sms.enabled=false")
             .run(context -> {
-                assertThat(context).doesNotHaveBean(SmsDao.class);
+                assertThat(context).hasSingleBean(SmsDao.class);
                 assertThat(context).doesNotHaveBean(SmsExceptionHandler.class);
             });
     }
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
index d125b5cd2..fd83b471a 100644
--- a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
@@ -22,7 +22,6 @@ public class SmsAutoConfiguration {
 
     @Primary
     @Bean
-    @ConditionalOnProperty(prefix = "sms", name = "enabled", havingValue = "true")
     public SmsDao smsDao() {
         return new PlusSmsDao();
     }