diff --git a/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java b/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java
index e3bb3d8..179b210 100644
--- a/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java
+++ b/src/main/java/org/terning/notification/application/writer/NotificationWriterImpl.java
@@ -1,6 +1,7 @@
 package org.terning.notification.application.writer;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.terning.message.domain.Message;
@@ -20,6 +21,7 @@
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class NotificationWriterImpl implements NotificationWriter {
 
     private static final String USERNAME = "username";
@@ -31,24 +33,72 @@ public class NotificationWriterImpl implements NotificationWriter {
     @Override
     @Transactional
     public void write(MessageTemplateType template, ScheduledTime sendTime) {
+        log.info("🔔 [NotificationWriter] 알림 생성 시작 - 템플릿: {}", template);
         List<User> targetUsers = fetchTargetUsers(template.targetType());
+        log.info("👥 [NotificationWriter] 대상 유저 수 (푸시 수신 허용 + 토큰 보유): {}", targetUsers.size());
+//        List<User> filteredUsers = targetUsers.stream()
+//                .filter(user -> user.getToken() != null)
+//                .filter(user -> user.getToken().value() != null)
+//                .filter(user -> !user.getToken().value().trim().isEmpty())
+//                .toList();
         List<User> filteredUsers = targetUsers.stream()
-                .filter(user -> user.getToken() != null)
-                .filter(user -> user.getToken().value() != null)
-                .filter(user -> !user.getToken().value().trim().isEmpty())
+                .filter(user -> {
+                    boolean valid = user.getToken() != null && user.getToken().value() != null && !user.getToken().value().trim().isEmpty();
+                    if (!valid) {
+                        log.warn("⚠️ [NotificationWriter] FCM 토큰 누락 - user(oUserId={}, name={})", user.getOUserId(), user.getName() != null ? user.getName().value() : "null");
+                    }
+                    return valid;
+                })
                 .toList();
+        log.info("✅ [NotificationWriter] 최종 알림 대상 유저 수: {}", filteredUsers.size());
+
         List<Notification> notifications = createNotifications(filteredUsers, template, sendTime);
+        log.info("💾 [NotificationWriter] 생성된 알림 수: {}", notifications.size());
+
         saveNotifications(notifications);
+        log.info("🎉 [NotificationWriter] 알림 저장 완료");
     }
 
     private List<User> fetchTargetUsers(MessageTargetType targetType) {
-        List<User> users = switch (targetType) {
-            case SCRAPPED_USER -> scrapRepository.findDistinctScrappedUsers();
-            case ALL_USERS -> userRepository.findAll();
-            default -> throw new NotificationException(NotificationErrorCode.INVALID_TARGET_TYPE);
-        };
+        log.info("🔍 [fetchTargetUsers] 대상 타입: {}", targetType);
+//        List<User> users = switch (targetType) {
+//            case SCRAPPED_USER -> scrapRepository.findDistinctScrappedUsers();
+//            case ALL_USERS -> userRepository.findAll();
+//            default -> throw new NotificationException(NotificationErrorCode.INVALID_TARGET_TYPE);
+//        };
+//        return users.stream()
+//                .filter(User::canReceivePushNotification)
+//                .toList();
+        List<User> users;
+
+        try {
+            users = switch (targetType) {
+                case SCRAPPED_USER -> {
+                    List<User> scrappedUsers = scrapRepository.findDistinctScrappedUsers();
+                    log.info("📦 [fetchTargetUsers] 스크랩 유저 수: {}", scrappedUsers.size());
+                    yield scrappedUsers;
+                }
+                case ALL_USERS -> {
+                    List<User> allUsers = userRepository.findAll();
+                    log.info("📦 [fetchTargetUsers] 전체 유저 수: {}", allUsers.size());
+                    yield allUsers;
+                }
+                default -> throw new NotificationException(NotificationErrorCode.INVALID_TARGET_TYPE);
+            };
+        } catch (Exception e) {
+            log.error("🔥 [fetchTargetUsers] 유저 조회 중 예외 발생", e);
+            throw e;
+        }
 
         return users.stream()
+                .peek(user -> {
+                    if (user.getPushStatus() == null) {
+                        log.warn("⚠️ [fetchTargetUsers] 유저(oUserId={})의 pushStatus가 null", user.getOUserId());
+                    }
+                    if (user.getToken() == null) {
+                        log.warn("⚠️ [fetchTargetUsers] 유저(oUserId={})의 FCM 토큰이 null", user.getOUserId());
+                    }
+                })
                 .filter(User::canReceivePushNotification)
                 .toList();
     }
diff --git a/src/main/java/org/terning/scrap/application/ScrapSyncManager.java b/src/main/java/org/terning/scrap/application/ScrapSyncManager.java
index 7f3e36d..5d439d2 100644
--- a/src/main/java/org/terning/scrap/application/ScrapSyncManager.java
+++ b/src/main/java/org/terning/scrap/application/ScrapSyncManager.java
@@ -18,15 +18,30 @@ public class ScrapSyncManager {
     private final UserRepository userRepository;
     private final ScrapRepository scrapRepository;
 
-    public void sync(List<Long> userIds) {
-        List<Long> distinctUserIds = userIds.stream().distinct().toList();
+    public void sync(List<Long> oUserIds) {
+        List<Long> distinctOUserIds = oUserIds.stream().distinct().toList();
+        Map<Long, User> usersByOUserId = userRepository.findUsersByOUserIds(distinctOUserIds);
 
-        Map<Long, User> usersById = userRepository.findUsersByIds(distinctUserIds);
-        Map<Long, Scrap> scrapsByUserId = scrapRepository.findScrapsByUserIds(distinctUserIds).stream()
+        List<Long> internalUserIds = usersByOUserId.values().stream()
+                .map(User::getId)
+                .toList();
+
+        Map<Long, Scrap> scrapsByUserId = scrapRepository.findScrapsByUserIds(internalUserIds).stream()
                 .collect(Collectors.toMap(scrap -> scrap.getUser().getId(), Function.identity()));
 
-        List<Scrap> scrapsToPersist = distinctUserIds.stream()
-                .map(userId -> createOrUpdateScrap(userId, usersById, scrapsByUserId))
+        List<Scrap> scrapsToPersist = distinctOUserIds.stream()
+                .map(oUserId -> {
+                    User user = usersByOUserId.get(oUserId);
+                    if (user == null) return null;
+
+                    Scrap existingScrap = scrapsByUserId.get(user.getId());
+                    if (existingScrap == null) return Scrap.of(user);
+                    if (existingScrap.isUnscrapped()) {
+                        existingScrap.scrap();
+                        return existingScrap;
+                    }
+                    return null;
+                })
                 .filter(Objects::nonNull)
                 .toList();
 
@@ -34,27 +49,4 @@ public void sync(List<Long> userIds) {
             scrapRepository.saveAll(scrapsToPersist);
         }
     }
-
-    private Scrap createOrUpdateScrap(
-            Long userId,
-            Map<Long, User> usersById,
-            Map<Long, Scrap> scrapsByUserId
-    ) {
-        User user = usersById.get(userId);
-        if (user == null) {
-            return null;
-        }
-
-        Scrap existingScrap = scrapsByUserId.get(userId);
-        if (existingScrap == null) {
-            return Scrap.of(user);
-        }
-
-        if (existingScrap.isUnscrapped()) {
-            existingScrap.scrap();
-            return existingScrap;
-        }
-
-        return null;
-    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/terning/scrap/domain/ScrapRepositoryImpl.java b/src/main/java/org/terning/scrap/domain/ScrapRepositoryImpl.java
index 289ab24..5bad55c 100644
--- a/src/main/java/org/terning/scrap/domain/ScrapRepositoryImpl.java
+++ b/src/main/java/org/terning/scrap/domain/ScrapRepositoryImpl.java
@@ -31,7 +31,7 @@ public List<User> findDistinctScrappedUsers() {
         return queryFactory
                 .selectDistinct(scrap.user)
                 .from(scrap)
-                .join(scrap.user, user).fetchJoin()
+                .join(scrap.user, user)
                 .where(scrap.status.eq(ScrapStatus.SCRAPPED))
                 .fetch();
     }
diff --git a/src/main/java/org/terning/user/domain/UserRepositoryCustom.java b/src/main/java/org/terning/user/domain/UserRepositoryCustom.java
index 64dd543..52b1cc8 100644
--- a/src/main/java/org/terning/user/domain/UserRepositoryCustom.java
+++ b/src/main/java/org/terning/user/domain/UserRepositoryCustom.java
@@ -7,6 +7,8 @@
 public interface UserRepositoryCustom {
     Map<Long, User> findUsersByIds(List<Long> userIds);
 
+    Map<Long, User> findUsersByOUserIds(List<Long> oUserIds);
+
     Optional<User> findByOUserId(Long oUserId);
 }
 
diff --git a/src/main/java/org/terning/user/domain/UserRepositoryImpl.java b/src/main/java/org/terning/user/domain/UserRepositoryImpl.java
index d7b2dd7..80f7cb9 100644
--- a/src/main/java/org/terning/user/domain/UserRepositoryImpl.java
+++ b/src/main/java/org/terning/user/domain/UserRepositoryImpl.java
@@ -26,6 +26,16 @@ public Map<Long, User> findUsersByIds(List<Long> userIds) {
                 .collect(Collectors.toMap(User::getId, Function.identity()));
     }
 
+    @Override
+    public Map<Long, User> findUsersByOUserIds(List<Long> oUserIds) {
+        return queryFactory
+                .selectFrom(QUser.user)
+                .where(QUser.user.oUserId.in(oUserIds))
+                .fetch()
+                .stream()
+                .collect(Collectors.toMap(User::getOUserId, Function.identity()));
+    }
+
     @Override
     public Optional<User> findByOUserId(Long oUserId) {
         QUser user = QUser.user;