diff --git a/apps/web/src/app/[locale]/join/page.tsx b/apps/web/src/app/[locale]/join/page.tsx
index 15d362bd21f0d484513350d83daab2c11c22149e..3c606b4ffe951ad8c25bb0f6c9580b68f26d87ae 100644
--- a/apps/web/src/app/[locale]/join/page.tsx
+++ b/apps/web/src/app/[locale]/join/page.tsx
@@ -30,7 +30,7 @@ const FAQ_ITEMS = [
 
 function JoinContent() {
   const searchParams = useSearchParams()
-  const joinData = searchParams.get('join')
+  const joinData = searchParams.get('code')
 
   return (
     <div className="flex flex-col min-h-screen">
diff --git a/apps/web/src/components/join/CreateHiveAccount.tsx b/apps/web/src/components/join/CreateHiveAccount.tsx
index b02ee2c79b69d13cd3f7fd19647b36e7e814230d..66f23689a71449bfa67784a97de1801ad6aa70f8 100644
--- a/apps/web/src/components/join/CreateHiveAccount.tsx
+++ b/apps/web/src/components/join/CreateHiveAccount.tsx
@@ -331,7 +331,7 @@ export default function CreateHiveAccount() {
     const link = generateShareableLink(shareData)
 
     // Verify encoding/decoding without logging sensitive data
-    const encoded = link.split('?join=')[1]
+    const encoded = link.split('?code=')[1]
     if (encoded) {
       const decoded = decodeAccountData(encoded)
 
diff --git a/apps/web/src/lib/share-link.ts b/apps/web/src/lib/share-link.ts
index 23db3a1223151489e4be02c74d16ebb288a628c9..ce9eb3cc46dd56665ef27950a45e815817b90cca 100644
--- a/apps/web/src/lib/share-link.ts
+++ b/apps/web/src/lib/share-link.ts
@@ -71,5 +71,5 @@ export function decodeAccountData(encoded: string): ShareableAccountData | null
  */
 export function generateShareableLink(data: ShareableAccountData, baseUrl: string = window.location.origin): string {
   const encoded = encodeAccountData(data)
-  return `${baseUrl}?join=${encoded}`
+  return `${baseUrl}/join?code=${encoded}`
 }