diff --git a/common/src/main/java/com/tencent/supersonic/common/service/impl/EmbeddingServiceImpl.java b/common/src/main/java/com/tencent/supersonic/common/service/impl/EmbeddingServiceImpl.java
index a8a0f590d..dd82d52f0 100644
--- a/common/src/main/java/com/tencent/supersonic/common/service/impl/EmbeddingServiceImpl.java
+++ b/common/src/main/java/com/tencent/supersonic/common/service/impl/EmbeddingServiceImpl.java
@@ -59,7 +59,6 @@ public class EmbeddingServiceImpl implements EmbeddingService {
                     continue;
                 }
                 embeddingStore.add(embedding, query);
-                cache.put(TextSegmentConvert.getQueryId(query), true);
             } catch (Exception e) {
                 log.error("embeddingModel embed error question: {}, embeddingStore: {}", question,
                         embeddingStore.getClass().getSimpleName(), e);
@@ -86,6 +85,7 @@ public class EmbeddingServiceImpl implements EmbeddingService {
         EmbeddingSearchResult result = embeddingStore.search(request);
         List<EmbeddingMatch<TextSegment>> relevant = result.matches();
         boolean exists = CollectionUtils.isNotEmpty(relevant);
+        cache.put(queryId, exists);
         return exists;
     }
 
@@ -104,6 +104,8 @@ public class EmbeddingServiceImpl implements EmbeddingService {
                     Filter filter = filterBuilder.isIn(queryIds);
                     inMemoryEmbeddingStore.removeAll(filter);
                 }
+            } else {
+                throw new RuntimeException("Not supported yet.");
             }
         } catch (Exception e) {
             log.error("deleteQuery error,collectionName:{},queries:{}", collectionName, queries);