diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java
index 8b177a963..9bef4a421 100644
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMapper.java
@@ -129,7 +129,7 @@ public abstract class BaseMapper implements SchemaMapper {
         Map<MatchText, List<T>> matchResult = matchStrategy.match(chatQueryContext, terms,
                 chatQueryContext.getRequest().getDataSetIds());
         List<T> matches = new ArrayList<>();
-        if (Objects.isNull(matchResult)) {
+        if (Objects.isNull(matchResult) || matchResult.isEmpty()) {
             return matches;
         }
         Optional<List<T>> first = matchResult.entrySet().stream()