diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 97a3f847..7179c957 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -994,12 +994,11 @@ public class StpLogic {
 		if(loginId == null) {
 			return defaultValue;
 		}
-        // 3、不为 null，则开始尝试类型转换
-        if (defaultValue != null) {
-            return (T) SaFoxUtil.getValueByType(loginId, defaultValue.getClass());
-        } else {
-            return (T) SaFoxUtil.getValueByType(loginId, Object.class);
+        // 3、loginId 不为 null，则开始尝试类型转换
+        if (defaultValue == null) {
+			return null;
         }
+		return (T) SaFoxUtil.getValueByType(loginId, defaultValue.getClass());
  	}
  	
  	/**