diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
index 09c8a21..93464bd 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberService.kt
@@ -831,14 +831,6 @@ class MemberService(
             container = container
         )
 
-        if (pushToken != null) {
-            pushTokenService.registerToken(
-                memberId = member.id!!,
-                token = pushToken,
-                deviceType = container
-            )
-        }
-
         if (!marketingPid.isNullOrBlank()) {
             member.activePid = marketingPid
             member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
@@ -847,6 +839,14 @@ class MemberService(
         repository.save(member)
         agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
 
+        if (pushToken != null) {
+            pushTokenService.registerToken(
+                memberId = member.id!!,
+                token = pushToken,
+                deviceType = container
+            )
+        }
+
         return member
     }
 
@@ -887,14 +887,6 @@ class MemberService(
             container = container
         )
 
-        if (pushToken != null) {
-            pushTokenService.registerToken(
-                memberId = member.id!!,
-                token = pushToken,
-                deviceType = container
-            )
-        }
-
         if (!marketingPid.isNullOrBlank()) {
             member.activePid = marketingPid
             member.partnerExpirationDatetime = LocalDateTime.now().plusYears(1)
@@ -903,6 +895,14 @@ class MemberService(
         repository.save(member)
         agreeTermsOfServiceAndPrivacyPolicy(member, stipulationTermsOfService, stipulationPrivacyPolicy)
 
+        if (pushToken != null) {
+            pushTokenService.registerToken(
+                memberId = member.id!!,
+                token = pushToken,
+                deviceType = container
+            )
+        }
+
         return member
     }