diff --git a/packages/app/src/components/quick-search/content/searchResult/index.tsx b/packages/app/src/components/quick-search/content/searchResult/index.tsx
index 21bc84b815..e921b527d6 100644
--- a/packages/app/src/components/quick-search/content/searchResult/index.tsx
+++ b/packages/app/src/components/quick-search/content/searchResult/index.tsx
@@ -5,22 +5,29 @@ import { PageMeta, useEditor } from '@/providers/editor-provider';
 
 function renderPages(resultsPageMeta: PageMeta[]) {
   return resultsPageMeta.map(resultPageMeta => {
-    return <Command.Item>{resultPageMeta.title}</Command.Item>;
+    return (
+      <Command.Item key={resultPageMeta.id}>
+        {resultPageMeta.title}
+      </Command.Item>
+    );
   });
 }
 
 const SearchResult = (props: { query: string }) => {
   const { search, getPageMeta, openPage } = useEditor();
-  const [results, setResults] = useState(new Map<string, string>());
+  const [results, setResults] = useState(new Map<string, string | undefined>());
   const query = props.query;
   useEffect(() => {
-    setResults(search(query));
+    return setResults(search(query));
     //Save the Map<BlockId, PageId> obtained from the search as state
   }, [query]);
 
   const resultsPageMeta: PageMeta[] = [];
 
   results.forEach(pageId => {
+    if (!pageId) {
+      return;
+    }
     const pageMeta = getPageMeta(pageId);
     if (pageMeta) {
       //Get pageMeta just like { title , id , text...}
diff --git a/packages/app/src/providers/editor-provider/interface.ts b/packages/app/src/providers/editor-provider/interface.ts
index 9cfda42fc1..e1fbfe514d 100644
--- a/packages/app/src/providers/editor-provider/interface.ts
+++ b/packages/app/src/providers/editor-provider/interface.ts
@@ -22,5 +22,5 @@ export type EditorHandlers = {
   unFavoritePage: (pageId: string) => void;
   toggleFavoritePage: (pageId: string) => void;
   permanentlyDeletePage: (pageId: string) => void;
-  search: (query: QueryContent) => Map<string, string>;
+  search: (query: QueryContent) => Map<string, string | undefined>;
 };
diff --git a/packages/app/src/providers/editor-provider/useEditorHandler.ts b/packages/app/src/providers/editor-provider/useEditorHandler.ts
index 3341ddbd52..04199ff486 100644
--- a/packages/app/src/providers/editor-provider/useEditorHandler.ts
+++ b/packages/app/src/providers/editor-provider/useEditorHandler.ts
@@ -50,9 +50,7 @@ export const useEditorHandler = (workspace?: Workspace): EditorHandlers => {
       }
     },
     search: (query: QueryContent) => {
-      if (query) {
-        return workspace!.search(query);
-      }
+      return workspace!.search(query);
     },
   };
 };