diff --git a/dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/druid/DruidConfigUtil.java b/dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/druid/DruidConfigUtil.java
index f32b0ebc..7a77fb14 100644
--- a/dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/druid/DruidConfigUtil.java
+++ b/dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/creator/druid/DruidConfigUtil.java
@@ -25,7 +25,13 @@
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Properties;
+import java.util.Set;
 
 /**
  * Druid配置工具类
@@ -85,7 +91,8 @@ public static Properties toProperties(@NonNull DruidConfig config) {
         }
         properties.setProperty(FILTERS, filters);
 
-        Properties connectProperties = config.getConnectionProperties();
+        Properties connectProperties = Optional.ofNullable(config.getConnectionProperties())
+                .orElse(new Properties());
         if (configFilterExist) {
             connectProperties.setProperty("config.decrypt", Boolean.TRUE.toString());
             connectProperties.setProperty("config.decrypt.key", publicKey);