diff --git a/app/components/GiscusComments.tsx b/app/components/GiscusComments.tsx
index 5883c78..cfde287 100644
--- a/app/components/GiscusComments.tsx
+++ b/app/components/GiscusComments.tsx
@@ -1,12 +1,15 @@
-'use client';
+"use client";
 
-import Giscus from '@giscus/react';
+import Giscus from "@giscus/react";
 
 interface GiscusCommentsProps {
   className?: string;
+  docId?: string | null;
 }
 
-export function GiscusComments({ className }: GiscusCommentsProps) {
+export function GiscusComments({ className, docId }: GiscusCommentsProps) {
+  const useDocId = typeof docId === "string" && docId.trim().length > 0;
+
   return (
     <div className={className}>
       <Giscus
@@ -14,7 +17,8 @@ export function GiscusComments({ className }: GiscusCommentsProps) {
         repoId="R_kgDOPuD_8A"
         category="Comments"
         categoryId="DIC_kwDOPuD_8M4Cvip8"
-        mapping="pathname"
+        mapping={useDocId ? "specific" : "pathname"}
+        term={useDocId ? docId : undefined}
         strict="0"
         reactionsEnabled="1"
         emitMetadata="0"
diff --git a/app/docs/[...slug]/page.tsx b/app/docs/[...slug]/page.tsx
index 1f4ec2f..0d20f06 100644
--- a/app/docs/[...slug]/page.tsx
+++ b/app/docs/[...slug]/page.tsx
@@ -86,7 +86,7 @@ export default async function DocPage({ params }: Param) {
           <Mdx components={getMDXComponents()} />
           <Contributors entry={contributorsEntry} />
           <section className="mt-16">
-            <GiscusComments />
+            <GiscusComments docId={docIdFromPage ?? null} />
           </section>
         </DocsBody>
       </DocsPage>