diff --git a/src/main/java/com/sb/web/account/service/AccountService.java b/src/main/java/com/sb/web/account/service/AccountService.java
index 078b5e8..be4846a 100644
--- a/src/main/java/com/sb/web/account/service/AccountService.java
+++ b/src/main/java/com/sb/web/account/service/AccountService.java
@@ -60,8 +60,10 @@ public class AccountService {
         List<Long> ids = entries.stream().map(AccountEntry::getId).toList();
         Map<Long, List<String>> tagsByEntry = new HashMap<>();
         for (Map<String, Object> row : mapper.findTagsByEntryIds(ids)) {
-            Long eid = ((Number) row.get("entryId")).longValue();
-            String name = (String) row.get("tagName");
+            Object rawId = row.get("entry_id");
+            String name = (String) row.get("tag_name");
+            if (rawId == null || name == null) continue;
+            Long eid = ((Number) rawId).longValue();
             tagsByEntry.computeIfAbsent(eid, k -> new ArrayList<>()).add(name);
         }
         return entries.stream()
diff --git a/src/main/resources/mapper/AccountEntryMapper.xml b/src/main/resources/mapper/AccountEntryMapper.xml
index 0150e41..91fe093 100644
--- a/src/main/resources/mapper/AccountEntryMapper.xml
+++ b/src/main/resources/mapper/AccountEntryMapper.xml
@@ -236,7 +236,7 @@
 
     <!-- 복수 항목의 태그를 한 번에 조회 — {entry_id, tag_name} 행 반환 -->
     <select id="findTagsByEntryIds" resultType="map">
-        SELECT aet.entry_id AS entryId, t.name AS tagName
+        SELECT aet.entry_id AS entry_id, t.name AS tag_name
         FROM account_tag t
         JOIN account_entry_tag aet ON aet.tag_id = t.id
         WHERE aet.entry_id IN