diff --git a/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt b/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
index 56e5f19e6..8304f8a71 100644
--- a/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
+++ b/mirai-core/src/commonMain/kotlin/network/QQAndroidClient.kt
@@ -20,15 +20,13 @@ import net.mamoe.mirai.internal.QQAndroidBot
 import net.mamoe.mirai.internal.network.components.AccountSecrets
 import net.mamoe.mirai.internal.network.components.SsoProcessorContext
 import net.mamoe.mirai.internal.network.components.SsoSession
+import net.mamoe.mirai.internal.network.components.encryptServiceOrNull
 import net.mamoe.mirai.internal.network.protocol.data.jce.FileStoragePushFSSvcList
 import net.mamoe.mirai.internal.network.protocol.packet.Tlv
-import net.mamoe.mirai.internal.spi.EncryptService
 import net.mamoe.mirai.internal.utils.AtomicIntSeq
 import net.mamoe.mirai.internal.utils.MiraiProtocolInternal
 import net.mamoe.mirai.internal.utils.NetworkType
 import net.mamoe.mirai.utils.*
-import kotlin.jvm.Synchronized
-import kotlin.jvm.Volatile
 import kotlin.random.Random
 
 
@@ -85,7 +83,7 @@ internal open class QQAndroidClient(
     override var loginState = 0
 
     val supportedEncrypt by lazy {
-        EncryptService.instance?.supports(bot.configuration.protocol) ?: false
+        bot.encryptServiceOrNull?.supports(bot.configuration.protocol) ?: false
     }
     var onlineStatus: OnlineStatus = OnlineStatus.ONLINE
 
diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt
index 292e873f2..71400bd16 100644
--- a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt
+++ b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/wtlogin/WtLogin9.kt
@@ -202,6 +202,7 @@ internal object WtLogin9 : WtLoginExt {
 
                     if (client.supportedEncrypt) {
                         t544ForToken(
+                            client = client,
                             uin = client.uin,
                             protocol = client.bot.configuration.protocol,
                             guid = client.device.guid,
diff --git a/mirai-core/src/commonMain/kotlin/spi/EncryptService.kt b/mirai-core/src/commonMain/kotlin/spi/EncryptService.kt
index 2467d5444..b7dbcb67a 100644
--- a/mirai-core/src/commonMain/kotlin/spi/EncryptService.kt
+++ b/mirai-core/src/commonMain/kotlin/spi/EncryptService.kt
@@ -50,7 +50,7 @@ public interface EncryptService : BaseService {
     /**
      * Returns `false` if not supported.
      */
-    public fun supports(protocol: BotConfiguration.MiraiProtocol) : Boolean {
+    public fun supports(protocol: BotConfiguration.MiraiProtocol): Boolean {
         return protocol != BotConfiguration.MiraiProtocol.ANDROID_WATCH
     }