diff --git a/src/components/Comments.astro b/src/components/Comments.astro
index af05d36..e6e6bd4 100644
--- a/src/components/Comments.astro
+++ b/src/components/Comments.astro
@@ -8,15 +8,11 @@ import Giscus from "./helper/comments/Giscus.astro";
 const method = siteConfig.comments.type
 
 const FediverseConfig = siteConfig.comments.fediverse
-interface Props {
-    path?: string;
-}
 
-let { path='/' } = Astro.props;
 ---
-{method === 'artalk' && <Artalk path={path} />}
-{method === 'giscus' && <Giscus/>}
+{method === 'artalk' && <Artalk />}
+{method === 'giscus' && <Giscus />}
 <!-- if prerender === true is set then render from client -->
-{(method === 'fediverse' && !FediverseConfig.renderOnServer ) && <FediverseComments path={path} /> }
-{(method === 'fediverse' && FediverseConfig.renderOnServer ) && <FediverseComments server:defer path={path} ><p>Loading comments...</p></FediverseComments> }
+{(method === 'fediverse' && !FediverseConfig.renderOnServer ) && <FediverseComments /> }
+{(method === 'fediverse' && FediverseConfig.renderOnServer ) && <FediverseComments server:defer><p>Loading comments...</p></FediverseComments> }
 {method === 'hatsu' && <HatsuComments /> }
\ No newline at end of file
diff --git a/src/components/helper/comments/Artalk.astro b/src/components/helper/comments/Artalk.astro
index ad52a8b..b39dadb 100644
--- a/src/components/helper/comments/Artalk.astro
+++ b/src/components/helper/comments/Artalk.astro
@@ -2,12 +2,10 @@
 import {siteConfig} from "../../../config";
 import 'artalk/Artalk.css';
 const ArtalkInstanceDomain = siteConfig.comments.artalk.instanceDomain
-
-const { path } = Astro.props;
 ---
 <div>
     <!-- Artalk -->
-    <div id="comments" data-path={path} data-server={ArtalkInstanceDomain}></div>
+    <div id="comments" data-path={Astro.url.pathname} data-server={ArtalkInstanceDomain}></div>
     <script>
         import Artalk from "artalk";
         const atkElement = document.querySelector('#comments');
diff --git a/src/components/helper/comments/Fediverse.astro b/src/components/helper/comments/Fediverse.astro
index 8627a2b..48efe6a 100644
--- a/src/components/helper/comments/Fediverse.astro
+++ b/src/components/helper/comments/Fediverse.astro
@@ -14,15 +14,8 @@ const {
 
 const serverRender = fediverseConfig.renderOnServer
 
-interface Props {
-  path: string;
-}
-
-const { path } = Astro.props;
-
 // Create the full URL to search for
-const fullSiteUrl = Astro.url.host;
-const postUrl = `https://${fullSiteUrl}${path.startsWith('/') ? path : '/' + path}`;
+const postUrl = Astro.url.href;
 
 // Define the search API endpoint based on configuration
 let searchEndpoint: string;
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index 4f2fee2..1a20332 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -62,7 +62,7 @@ const cover = customFeaturedImage || matchedImage_src?.src || firstImageURL || `
     <ReplyViaEmail title={entry.data.title} email={authorInfo.email} />
         <br>
     <a href="/blog">&larr; Back to posts</a>
-    {!noscript && <h2>Comments</h2> <Comments path={`blog/${slug}`} />}
+    {!noscript && <h2>Comments</h2> <Comments />}
     {!noscript &&
         <script>
             import "katex/dist/contrib/copy-tex.js"