diff --git a/apps/builder/components/share/ShareContent.tsx b/apps/builder/components/share/ShareContent.tsx
index 82695610f..36a61eba5 100644
--- a/apps/builder/components/share/ShareContent.tsx
+++ b/apps/builder/components/share/ShareContent.tsx
@@ -41,6 +41,14 @@ export const ShareContent = () => {
     : ''
   const isPublished = isDefined(typebot?.publishedTypebotId)
 
+  const handlePathnameChange = (pathname: string) => {
+    if (!typebot?.customDomain) return
+    const existingHost = typebot.customDomain?.split('/')[0]
+    const newDomain =
+      pathname === '' ? existingHost : existingHost + '/' + pathname
+    handleCustomDomainChange(newDomain)
+  }
+
   const handleCustomDomainChange = (customDomain: string | null) =>
     updateOnBothTypebots({ customDomain })
 
@@ -65,11 +73,7 @@ export const ShareContent = () => {
               <EditableUrl
                 hostname={'https://' + typebot.customDomain.split('/')[0]}
                 pathname={typebot.customDomain.split('/')[1]}
-                onPathnameChange={(pathname) =>
-                  handleCustomDomainChange(
-                    typebot.customDomain?.split('/')[0] + '/' + pathname
-                  )
-                }
+                onPathnameChange={handlePathnameChange}
               />
               <IconButton
                 icon={<TrashIcon />}
diff --git a/apps/viewer/pages/[[...publicId]].tsx b/apps/viewer/pages/[[...publicId]].tsx
index 179598c02..2a648c799 100644
--- a/apps/viewer/pages/[[...publicId]].tsx
+++ b/apps/viewer/pages/[[...publicId]].tsx
@@ -50,7 +50,7 @@ const getTypebotFromPublicId = async (publicId?: string) => {
 
 const getTypebotFromCustomDomain = async (customDomain: string) => {
   const typebot = await prisma.publicTypebot.findFirst({
-    where: { customDomain: { contains: customDomain } },
+    where: { customDomain },
   })
   if (isNotDefined(typebot)) return null
   return omit(typebot as unknown as PublicTypebot, 'createdAt', 'updatedAt')