diff --git a/src/main/java/cn/axzo/pokonyan/config/mybatisplus/type/SetTypeHandler.java b/src/main/java/cn/axzo/pokonyan/config/mybatisplus/type/SetTypeHandler.java
index af0a4f0..7dd0a6a 100644
--- a/src/main/java/cn/axzo/pokonyan/config/mybatisplus/type/SetTypeHandler.java
+++ b/src/main/java/cn/axzo/pokonyan/config/mybatisplus/type/SetTypeHandler.java
@@ -58,7 +58,7 @@ public class SetTypeHandler extends BaseTypeHandler<Set<String>> {
         return Splitter.on(",")
                 .omitEmptyStrings()
                 .trimResults()
-                .splitToList(Optional.of(dbValue).orElse(StringUtils.EMPTY))
+                .splitToList(Optional.ofNullable(dbValue).orElse(StringUtils.EMPTY))
                 .stream()
                 .collect(Collectors.toSet());
     }