diff --git a/src/main/java/com/huawei/push/messaging/HuaweiApp.java b/src/main/java/com/huawei/push/messaging/HuaweiApp.java
index 65a070aa2c074a9cd4e9cb3dd1c5a2078196d34d..9e1f911f355d99ed481622b402dbf9b5b5f52d00 100644
--- a/src/main/java/com/huawei/push/messaging/HuaweiApp.java
+++ b/src/main/java/com/huawei/push/messaging/HuaweiApp.java
@@ -115,8 +115,8 @@ public class HuaweiApp {
             if (!instances.containsKey(appId)) {
                 ValidatorUtils.checkState(!instances.containsKey(appId), "HuaweiApp with id " + appId + " already exists!");
                 app = new HuaweiApp(option);
-                instances.put(appId, app);
                 app.startTokenRefresher();
+                instances.put(appId, app);
             } else {
                 app = getInstance(option);
             }