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 5a92a07..45fa78e 100644
--- a/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
+++ b/src/main/kotlin/kr/co/vividnext/sodalive/member/MemberRepository.kt
@@ -80,6 +80,7 @@ class MemberQueryRepositoryImpl(
         var where = member.isActive.isTrue
             .and(member.email.notIn("admin@sodalive.net"))
             .and(member.container.eq(container))
+            .and(member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)
@@ -113,6 +114,7 @@ class MemberQueryRepositoryImpl(
                     blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
+            .and(creatorFollowing.member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)
@@ -149,6 +151,7 @@ class MemberQueryRepositoryImpl(
                     blockMemberRepository.getBlockedMemberList(creatorId)
                 )
             )
+            .and(creatorFollowing.member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)
@@ -177,7 +180,10 @@ class MemberQueryRepositoryImpl(
             )
             .from(message)
             .innerJoin(message.recipient, member)
-            .where(message.id.eq(messageId))
+            .where(
+                message.id.eq(messageId)
+                    .and(member.pushToken.isNotNull)
+            )
             .fetchFirst()
     }
 
@@ -188,6 +194,7 @@ class MemberQueryRepositoryImpl(
         var where = member.isActive.isTrue
             .and(member.email.notIn("admin@sodalive.net"))
             .and(member.id.`in`(*recipients.toTypedArray()))
+            .and(member.pushToken.isNotNull)
 
         if (isAuth) {
             where = where.and(member.auth.isNotNull)