diff --git a/android/app/src/main/java/cn/ilapage/goauto/agent/service/AgentForegroundService.kt b/android/app/src/main/java/cn/ilapage/goauto/agent/service/AgentForegroundService.kt
index 9d2b896..1885fee 100644
--- a/android/app/src/main/java/cn/ilapage/goauto/agent/service/AgentForegroundService.kt
+++ b/android/app/src/main/java/cn/ilapage/goauto/agent/service/AgentForegroundService.kt
@@ -187,11 +187,12 @@ class AgentForegroundService : Service() {
 
             if (!registeredThisProcess.get()) {
                 val registration = api.register(deviceInfo(), credentials?.token)
-                if (credentials == null) {
+                if (registration.deviceToken != null) {
                     val issuedToken = registration.deviceToken
-                        ?: error("注册请求已处理，但未返回新 Token；请联系管理员重新签发")
                     identityStore.saveCredentials(registration.deviceId, issuedToken)
                     credentials = identityStore.credentials() ?: error("设备凭据保存失败")
+                } else if (credentials == null) {
+                    error("注册请求已处理，但未返回新 Token；请联系管理员重新签发")
                 } else {
                     check(registration.deviceId == credentials.deviceId) { "服务端设备身份与本地不一致" }
                 }