diff --git a/frontend/pages/[slug]/index.js b/frontend/pages/[slug]/index.js
index 3c19668..e89344d 100644
--- a/frontend/pages/[slug]/index.js
+++ b/frontend/pages/[slug]/index.js
@@ -1,7 +1,6 @@
-import { notFound } from 'next/navigation'
 import directus from '~/lib/directus'
 
-export const getStaticPaths = async () => {
+export const getServerSideProps = async () => {
   const { data: pages } = await directus.items('pages').readByQuery({
     limit: 1,
   })
diff --git a/frontend/pages/vendors/[slug]/page.js b/frontend/pages/vendors/[slug]/index.js
similarity index 86%
rename from frontend/pages/vendors/[slug]/page.js
rename to frontend/pages/vendors/[slug]/index.js
index 708bc92..fafd7d3 100644
--- a/frontend/pages/vendors/[slug]/page.js
+++ b/frontend/pages/vendors/[slug]/index.js
@@ -1,8 +1,12 @@
 import { notFound } from 'next/navigation'
 import directus from '~/lib/directus'
 
-async function getVendor(slug) {
-  return directus.items('vendors').readByQuery({
+export const getServerSideProps = async ({ params }) => {
+  const { slug } = params
+
+  const {
+    data: [vendor],
+  } = await directus.items('vendors').readByQuery({
     fields: [
       //
       '*',
@@ -15,17 +19,13 @@ async function getVendor(slug) {
     limit: 1,
     filter: { slug: { _eq: slug } },
   })
+
+  if (!vendor) return notFound()
+
+  return { props: { vendor } }
 }
 
-export default async function VendorPage({ params }) {
-  const {
-    data: [vendor],
-  } = await getVendor(params.slug)
-
-  if (!vendor) {
-    notFound()
-  }
-
+export default function VendorPage({ vendor }) {
   return (
     <div>
       <h1>{vendor.name}</h1>
diff --git a/frontend/pages/vendors/index.js b/frontend/pages/vendors/index.js
index 1d90cf2..3ab606c 100644
--- a/frontend/pages/vendors/index.js
+++ b/frontend/pages/vendors/index.js
@@ -49,7 +49,7 @@ export default function VendorsPage({ vendors, meta, page }) {
 
   const handlePageChange = (nextPage) => {
     setCurrentPage(nextPage)
-    router.replace(`/vendors?page=${nextPage}`)
+    router.replace(`?page=${nextPage}`)
   }
 
   return (