diff --git a/src/runtime/query/match/pipeline-legacy.ts b/src/runtime/query/match/pipeline-legacy.ts
index ac0214c4f..455c8e052 100644
--- a/src/runtime/query/match/pipeline-legacy.ts
+++ b/src/runtime/query/match/pipeline-legacy.ts
@@ -11,10 +11,10 @@ export function createPipelineFetcherLegacy<T> (getContentsList: () => Promise<T
 
     if (params.surround) {
       // @ts-ignore
-      return result.surround
+      return result?.surround
     }
 
-    if ((result as any).dirConfig) {
+    if ((result as any)?.dirConfig) {
       result.result = {
         _path: (result as any).dirConfig?._path,
         ...(result.result as T),
@@ -22,6 +22,6 @@ export function createPipelineFetcherLegacy<T> (getContentsList: () => Promise<T
       }
     }
 
-    return result.result as T | T[]
+    return result?.result as T | T[]
   }
 }
diff --git a/src/runtime/query/query.ts b/src/runtime/query/query.ts
index 31d8a1d1a..7a0c1ea9b 100644
--- a/src/runtime/query/query.ts
+++ b/src/runtime/query/query.ts
@@ -35,7 +35,7 @@ export function createQuery <T = ParsedContent> (fetcher: ContentQueryFetcher<T>
         return result.surround
       }
 
-      if ((result as any).dirConfig) {
+      if ((result as any)?.dirConfig) {
         result.result = {
           _path: (result as any).dirConfig?._path,
           ...(result.result as T),