diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
index fb1a2c897c..5554ab7101 100644
--- a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
+++ b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenEntity.java
@@ -95,8 +95,8 @@ public class TokenEntity extends BaseEntity {
 
     // 验证token是否有效
     public Boolean isValid() {
-        return !revoked && !isDeleted() && 
-               (permanent || (expiresAt != null && expiresAt.isAfter(BdDateUtils.now())));
+        return !Boolean.TRUE.equals(revoked) && !isDeleted() && 
+               (Boolean.TRUE.equals(permanent) || (expiresAt != null && expiresAt.isAfter(BdDateUtils.now())));
     }
 
     // 撤销token
diff --git a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
index 593733ae90..15b0f83560 100644
--- a/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
+++ b/modules/core/src/main/java/com/bytedesk/core/rbac/token/TokenRestService.java
@@ -87,8 +87,8 @@ public class TokenRestService extends BaseRestService<TokenEntity, TokenRequest,
         }
         entity.setUserUid(user.getUid());
         
-        // 统一设置过期时间，如果请求中没有设置过期时间，则使用JWT配置的过期时间
-        if (entity.getExpiresAt() == null) {
+        // 非永久有效，且未设置过期时间，则根据channel设置默认过期时间
+        if (!Boolean.TRUE.equals(entity.getPermanent()) && entity.getExpiresAt() == null) {
             entity.setExpiresAt(JwtUtils.calculateExpirationTime(request.getChannel()));
         }