diff --git a/src/main/java/com/challenge/domain/notification/NotificationQueryRepository.java b/src/main/java/com/challenge/domain/notification/NotificationQueryRepository.java
index d2ee59d..acfa72e 100644
--- a/src/main/java/com/challenge/domain/notification/NotificationQueryRepository.java
+++ b/src/main/java/com/challenge/domain/notification/NotificationQueryRepository.java
@@ -45,7 +45,7 @@ public Map<String, NewChallengeDTO> getNewChallengeTargets() {
                 .leftJoin(challenge)
                 .on(challenge.member.id.eq(member.id)
                         .and(challenge.status.eq(ChallengeStatus.ONGOING)))
-                .where(member.isNotificationReceived.eq(true))
+                .where(member.fcmToken.isNotNull())
                 .groupBy(member.id, member.fcmToken, member.nickname)
                 .having(challenge.id.count().eq(0L))
                 .fetch();
@@ -86,7 +86,7 @@ public Map<String, AchieveChallengeDTO> getAchieveTargetsAndChallenge(LocalDate
                 .join(member).on(challenge.member.id.eq(member.id))
                 .where(challenge.status.eq(ChallengeStatus.ONGOING),
                         lastRecordSucceed(day).eq(false),
-                        member.isNotificationReceived.eq(true))
+                        member.fcmToken.isNotNull())
                 .fetch();
 
         // 결과를 Map<String, AchieveChallengeDTO> 형태로 변환