diff --git a/src/module.ts b/src/module.ts
index 36cf7921e..22e5ff5b0 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -570,14 +570,14 @@ export default defineNuxtModule<ModuleOptions>({
         // Disable cache in dev mode
         integrity: nuxt.options.dev ? undefined : Date.now()
       },
-      navigation: contentContext.navigation,
+      navigation: contentContext.navigation as any,
       base: options.base,
       // Tags will use in markdown renderer for component replacement
       tags: contentContext.markdown.tags as any,
       highlight: options.highlight as any,
       wsUrl: '',
       // Document-driven configuration
-      documentDriven: options.documentDriven as ModuleOptions['documentDriven'],
+      documentDriven: options.documentDriven as any,
       // Anchor link generation config
       anchorLinks: options.markdown.anchorLinks
     })
diff --git a/src/runtime/components/ContentDoc.vue b/src/runtime/components/ContentDoc.vue
index 2436395c7..22926de56 100644
--- a/src/runtime/components/ContentDoc.vue
+++ b/src/runtime/components/ContentDoc.vue
@@ -1,5 +1,6 @@
 <script lang="ts">
 import { PropType, defineComponent, h, useSlots } from 'vue'
+import { withTrailingSlash } from 'ufo'
 import type { QueryBuilderParams } from '../types'
 import ContentRenderer from './ContentRenderer'
 import ContentQuery from './ContentQuery'
@@ -42,7 +43,7 @@ export default defineComponent({
     path: {
       type: String,
       required: false,
-      default: () => useRoute().path
+      default: undefined
     },
 
     /**
@@ -78,7 +79,11 @@ export default defineComponent({
     const { tag, excerpt, path, query, head } = ctx
 
     // Merge local `path` props and apply `findOne` query default.
-    const contentQueryProps = Object.assign(query || {}, { path, find: 'one' })
+    const contentQueryProps = {
+      ...query || {},
+      path: path || query?.path || withTrailingSlash(useRoute().path),
+      find: 'one'
+    }
 
     const emptyNode = (slot: string, data: any) => h('pre', null, JSON.stringify({ message: 'You should use slots with <ContentDoc>', slot, data }, null, 2))