diff --git a/apps/start/src/components/chat/chat-messages.tsx b/apps/start/src/components/chat/chat-messages.tsx
index c4797e8f..957b90ba 100644
--- a/apps/start/src/components/chat/chat-messages.tsx
+++ b/apps/start/src/components/chat/chat-messages.tsx
@@ -1,4 +1,6 @@
+import { useAppParams } from '@/hooks/use-app-params';
 import { useScrollAnchor } from '@/hooks/use-scroll-anchor';
+import { Link } from '@tanstack/react-router';
 import type { UIMessage } from 'ai';
 import { Loader2Icon } from 'lucide-react';
 import { useEffect } from 'react';
@@ -18,6 +20,7 @@ export function ChatMessages({
   status: 'submitted' | 'streaming' | 'ready' | 'error';
   isLimited: boolean;
 }) {
+  const { organizationId } = useAppParams();
   const { messagesRef, scrollRef, visibilityRef, scrollToBottom } =
     useScrollAnchor();
 
@@ -60,12 +63,15 @@ export function ChatMessages({
                   To keep using this feature you need to upgrade your account.
                 </p>
                 <p>
-                  <ProjectLink
-                    href="/settings/organization?tab=billing"
+                  <Link
+                    to="/$organizationId/billing"
+                    params={{
+                      organizationId,
+                    }}
                     className="font-medium underline"
                   >
                     Visit Billing
-                  </ProjectLink>{' '}
+                  </Link>{' '}
                   to upgrade.
                 </p>
               </AlertDescription>
diff --git a/apps/worker/src/jobs/misc.trail-ending-soon.ts b/apps/worker/src/jobs/misc.trail-ending-soon.ts
index aa1dba3b..db52489a 100644
--- a/apps/worker/src/jobs/misc.trail-ending-soon.ts
+++ b/apps/worker/src/jobs/misc.trail-ending-soon.ts
@@ -44,7 +44,7 @@ export async function trialEndingSoonJob(
     to: organization.createdBy?.email,
     data: {
       organizationName: organization.name,
-      url: `https://dashboard.openpanel.dev/${organization.id}/${project.id}/settings/organization?tab=billing`,
+      url: `https://dashboard.openpanel.dev/${organization.id}/billing`,
     },
   });
 }