diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt
index de78852..962431f 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/live/AdminLiveService.kt
@@ -293,9 +293,9 @@ class AdminLiveService(
                         charge.useCan = useCan
 
                         when (it.paymentGateway) {
-                            PaymentGateway.PG -> booker.pgRewardCan += charge.rewardCan
                             PaymentGateway.GOOGLE_IAP -> booker.googleRewardCan += charge.rewardCan
                             PaymentGateway.APPLE_IAP -> booker.appleRewardCan += charge.rewardCan
+                            else -> booker.pgRewardCan += charge.rewardCan
                         }
                         charge.member = booker
 
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt
index ba53b6e..2306751 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/charge/event/ChargeEventService.kt
@@ -122,9 +122,9 @@ class ChargeEventService(
         chargeRepository.save(eventCharge)
 
         when (paymentGateway) {
-            PaymentGateway.PG -> member.charge(0, additionalCan, "pg")
             PaymentGateway.GOOGLE_IAP -> member.charge(0, additionalCan, "aos")
             PaymentGateway.APPLE_IAP -> member.charge(0, additionalCan, "ios")
+            else -> member.charge(0, additionalCan, "pg")
         }
     }
 }
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt
index 602e82e..b9b552f 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/can/payment/CanPaymentService.kt
@@ -162,9 +162,9 @@ class CanPaymentService(
                     charge.rewardCan -= remainingNeedCan
 
                     when (charge.payment!!.paymentGateway) {
-                        PaymentGateway.PG -> member.pgRewardCan -= remainingNeedCan
                         PaymentGateway.APPLE_IAP -> member.appleRewardCan -= remainingNeedCan
                         PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= remainingNeedCan
+                        else -> member.pgRewardCan -= remainingNeedCan
                     }
 
                     total += remainingNeedCan
@@ -185,9 +185,9 @@ class CanPaymentService(
                     )
 
                     when (charge.payment!!.paymentGateway) {
-                        PaymentGateway.PG -> member.pgRewardCan -= charge.rewardCan
                         PaymentGateway.APPLE_IAP -> member.appleRewardCan -= charge.rewardCan
                         PaymentGateway.GOOGLE_IAP -> member.googleRewardCan -= charge.rewardCan
+                        else -> member.pgRewardCan -= charge.rewardCan
                     }
 
                     charge.rewardCan = 0
@@ -220,9 +220,9 @@ class CanPaymentService(
                     charge.chargeCan -= remainingNeedCan
 
                     when (charge.payment!!.paymentGateway) {
-                        PaymentGateway.PG -> member.pgChargeCan -= remainingNeedCan
                         PaymentGateway.APPLE_IAP -> member.appleChargeCan -= remainingNeedCan
                         PaymentGateway.GOOGLE_IAP -> member.googleChargeCan -= remainingNeedCan
+                        else -> member.pgChargeCan -= remainingNeedCan
                     }
 
                     total += remainingNeedCan
@@ -243,9 +243,9 @@ class CanPaymentService(
                     )
 
                     when (charge.payment!!.paymentGateway) {
-                        PaymentGateway.PG -> member.pgChargeCan -= charge.chargeCan
                         PaymentGateway.APPLE_IAP -> member.appleChargeCan -= charge.chargeCan
                         PaymentGateway.GOOGLE_IAP -> member.pgChargeCan -= charge.chargeCan
+                        else -> member.pgChargeCan -= charge.chargeCan
                     }
 
                     charge.chargeCan = 0
@@ -280,9 +280,9 @@ class CanPaymentService(
             charge.useCan = useCan
 
             when (it.paymentGateway) {
-                PaymentGateway.PG -> member.pgRewardCan += charge.rewardCan
                 PaymentGateway.GOOGLE_IAP -> member.googleRewardCan += charge.rewardCan
                 PaymentGateway.APPLE_IAP -> member.appleRewardCan += charge.rewardCan
+                else -> member.pgRewardCan += charge.rewardCan
             }
             charge.member = member
 
diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
index 2d4d4cf..0a894b7 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -127,6 +127,7 @@ class MemberQueryRepositoryImpl(
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
+            .or(member.id.eq(4).and(member.pushToken.isNotNull))
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)
@@ -162,6 +163,7 @@ class MemberQueryRepositoryImpl(
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
+            .or(member.id.eq(4).and(member.pushToken.isNotNull))
 
         if (isAuth) {
             where = where.and(creatorFollowing.member.auth.isNotNull)
@@ -219,6 +221,7 @@ class MemberQueryRepositoryImpl(
                 )
             )
             .and(creatorFollowing.member.pushToken.isNotNull)
+            .or(member.id.eq(4).and(member.pushToken.isNotNull))
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)