diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7b85d47..f2c4723b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed issue where incorrect repository icons were shown occasionally in the filter panel. ([#95](https://github.com/sourcebot-dev/sourcebot/issues/95))
+- Fixed homepage links not resolving correctly when DOMAIN_SUB_PATH is set. ([#96](https://github.com/sourcebot-dev/sourcebot/issues/96))
 
 ## [2.5.1] - 2024-11-26
 
diff --git a/packages/web/src/app/page.tsx b/packages/web/src/app/page.tsx
index fff20c43..9a1c5a9f 100644
--- a/packages/web/src/app/page.tsx
+++ b/packages/web/src/app/page.tsx
@@ -10,6 +10,7 @@ import { SearchBar } from "./components/searchBar";
 import { Separator } from "@/components/ui/separator";
 import { SymbolIcon } from "@radix-ui/react-icons";
 import { UpgradeToast } from "./components/upgradeToast";
+import Link from "next/link";
 
 
 export default async function Home() {
@@ -123,12 +124,12 @@ const RepositoryList = async () => {
         <div className="flex flex-col items-center gap-3">
             <span className="text-sm">
                 {`Search ${repos.length} `}
-                <a
+                <Link
                     href="/repos"
                     className="text-blue-500"
                 >
                     {repos.length > 1 ? 'repositories' : 'repository'}
-                </a>
+                </Link>
             </span>
             <RepositoryCarousel repos={repos} />
         </div>
@@ -171,11 +172,11 @@ const QueryExplanation = ({ children }: { children: React.ReactNode }) => {
 
 const Query = ({ query, children }: { query: string, children: React.ReactNode }) => {
     return (
-        <a
+        <Link
             href={`/search?query=${query}`}
             className="cursor-pointer hover:underline"
         >
             {children}
-        </a>
+        </Link>
     )
 }