diff --git a/components/WebsiteDetails.js b/components/WebsiteDetails.js
index f24332ba..b38f55de 100644
--- a/components/WebsiteDetails.js
+++ b/components/WebsiteDetails.js
@@ -37,6 +37,7 @@ export default function WebsiteDetails({ websiteId, token }) {
   const [eventsData, setEventsData] = useState();
   const {
     resolve,
+    router,
     query: { view },
   } = usePageQuery();
 
@@ -44,7 +45,7 @@ export default function WebsiteDetails({ websiteId, token }) {
     <Link
       key="back-button"
       className={styles.backButton}
-      href="/website/[...id]"
+      href={router.pathname}
       as={resolve({ view: undefined })}
       icon={<Arrow />}
       size="small"
diff --git a/components/metrics/MetricsTable.js b/components/metrics/MetricsTable.js
index 1f2145f7..3ac8a395 100644
--- a/components/metrics/MetricsTable.js
+++ b/components/metrics/MetricsTable.js
@@ -32,6 +32,7 @@ export default function MetricsTable({
   const { startDate, endDate, modified } = dateRange;
   const {
     resolve,
+    router,
     query: { url },
   } = usePageQuery();
 
@@ -108,7 +109,7 @@ export default function MetricsTable({
             {limit && (
               <Link
                 icon={<Arrow />}
-                href="/website/[...id]"
+                href={router.pathname}
                 as={resolve({ view: type })}
                 size="small"
                 iconRight
diff --git a/package.json b/package.json
index cd7843f0..ed4e470d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "umami",
-  "version": "0.54.0",
+  "version": "0.55.0",
   "description": "A simple, fast, website analytics alternative to Google Analytics. ",
   "author": "Mike Cao <mike@mikecao.com>",
   "license": "MIT",