diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts
index 927513eb4..ad5d5f24e 100644
--- a/packages/web/src/actions.ts
+++ b/packages/web/src/actions.ts
@@ -277,7 +277,6 @@ export const getRepos = async ({
                 repoName: repo.name,
                 path: '',
                 pathType: 'tree',
-                domain: org.domain,
             })}`,
             externalWebUrl: repo.webUrl ?? undefined,
             imageUrl: repo.imageUrl ?? undefined,
diff --git a/packages/web/src/app/[domain]/browse/[...path]/components/pureTreePreviewPanel.tsx b/packages/web/src/app/[domain]/browse/[...path]/components/pureTreePreviewPanel.tsx
index 1c4f6ae43..6b714fb99 100644
--- a/packages/web/src/app/[domain]/browse/[...path]/components/pureTreePreviewPanel.tsx
+++ b/packages/web/src/app/[domain]/browse/[...path]/components/pureTreePreviewPanel.tsx
@@ -5,7 +5,6 @@ import { FileTreeItemComponent } from "@/app/[domain]/browse/components/fileTree
 import { getBrowsePath } from "../../hooks/utils";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { useBrowseParams } from "../../hooks/useBrowseParams";
-import { useDomain } from "@/hooks/useDomain";
 import { FileTreeItem } from "@/features/git";
 
 interface PureTreePreviewPanelProps {
@@ -15,7 +14,6 @@ interface PureTreePreviewPanelProps {
 export const PureTreePreviewPanel = ({ items }: PureTreePreviewPanelProps) => {
     const { repoName, revisionName } = useBrowseParams();
     const scrollAreaRef = useRef<HTMLDivElement>(null);
-    const domain = useDomain();
    
     return (
         <ScrollArea
@@ -35,7 +33,6 @@ export const PureTreePreviewPanel = ({ items }: PureTreePreviewPanelProps) => {
                         revisionName,
                         path: item.path,
                         pathType: item.type === 'tree' ? 'tree' : 'blob',
-                        domain,
                     })}
                 />
             ))}
diff --git a/packages/web/src/app/[domain]/browse/components/pureFileTreePanel.tsx b/packages/web/src/app/[domain]/browse/components/pureFileTreePanel.tsx
index 34a64685d..a6c2dc3cf 100644
--- a/packages/web/src/app/[domain]/browse/components/pureFileTreePanel.tsx
+++ b/packages/web/src/app/[domain]/browse/components/pureFileTreePanel.tsx
@@ -6,7 +6,6 @@ import React, { useCallback, useMemo, useRef } from "react";
 import { FileTreeItemComponent } from "./fileTreeItemComponent";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
 import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
-import { useDomain } from "@/hooks/useDomain";
 
 const renderLoadingSkeleton = (depth: number) => {
     return (
@@ -28,7 +27,6 @@ interface PureFileTreePanelProps {
 export const PureFileTreePanel = ({ tree, openPaths, path, onTreeNodeClicked }: PureFileTreePanelProps) => {
     const scrollAreaRef = useRef<HTMLDivElement>(null);
     const { repoName, revisionName } = useBrowseParams();
-    const domain = useDomain();
 
     const renderTree = useCallback((nodes: FileTreeNode, depth = 0): React.ReactNode => {
         return (
@@ -42,7 +40,6 @@ export const PureFileTreePanel = ({ tree, openPaths, path, onTreeNodeClicked }:
                                     revisionName,
                                     path: node.path,
                                     pathType: node.type === 'tree' ? 'tree' : 'blob',
-                                    domain,
                                 })}
                                 key={node.path}
                                 node={node}
@@ -80,7 +77,7 @@ export const PureFileTreePanel = ({ tree, openPaths, path, onTreeNodeClicked }:
                 })}
             </>
         );
-    }, [domain, onTreeNodeClicked, path, repoName, revisionName, openPaths]);
+    }, [onTreeNodeClicked, path, repoName, revisionName, openPaths]);
 
     const renderedTree = useMemo(() => renderTree(tree), [tree, renderTree]);
 
diff --git a/packages/web/src/app/[domain]/browse/hooks/useBrowseNavigation.ts b/packages/web/src/app/[domain]/browse/hooks/useBrowseNavigation.ts
index 0ab8e71c4..e3168bd53 100644
--- a/packages/web/src/app/[domain]/browse/hooks/useBrowseNavigation.ts
+++ b/packages/web/src/app/[domain]/browse/hooks/useBrowseNavigation.ts
@@ -1,13 +1,11 @@
 'use client';
 
 import { useRouter } from "next/navigation";
-import { useDomain } from "@/hooks/useDomain";
 import { useCallback } from "react";
 import { getBrowsePath, GetBrowsePathProps } from "./utils";
 
 export const useBrowseNavigation = () => {
     const router = useRouter();
-    const domain = useDomain();
 
     const navigateToPath = useCallback(({
         repoName,
@@ -16,7 +14,7 @@ export const useBrowseNavigation = () => {
         pathType,
         highlightRange,
         setBrowseState,
-    }: Omit<GetBrowsePathProps, 'domain'>) => {
+    }: GetBrowsePathProps) => {
         const browsePath = getBrowsePath({
             repoName,
             revisionName,
@@ -24,13 +22,12 @@ export const useBrowseNavigation = () => {
             pathType,
             highlightRange,
             setBrowseState,
-            domain,
         });
 
         router.push(browsePath);
-    }, [domain, router]);
+    }, [router]);
 
     return {
         navigateToPath,
     };
-}; 
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/packages/web/src/app/[domain]/browse/hooks/utils.ts b/packages/web/src/app/[domain]/browse/hooks/utils.ts
index b0aa3100d..77cbb9ab2 100644
--- a/packages/web/src/app/[domain]/browse/hooks/utils.ts
+++ b/packages/web/src/app/[domain]/browse/hooks/utils.ts
@@ -1,4 +1,5 @@
 import { BrowseState, SET_BROWSE_STATE_QUERY_PARAM } from "../browseStateProvider";
+import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 
 export const HIGHLIGHT_RANGE_QUERY_PARAM = 'highlightRange';
 
@@ -17,7 +18,6 @@ export interface GetBrowsePathProps {
     pathType: 'blob' | 'tree';
     highlightRange?: BrowseHighlightRange;
     setBrowseState?: Partial<BrowseState>;
-    domain: string;
 }
 
 export const getBrowseParamsFromPathParam = (pathParam: string) => {
@@ -64,8 +64,9 @@ export const getBrowseParamsFromPathParam = (pathParam: string) => {
 };
 
 export const getBrowsePath = ({
-    repoName, revisionName, path, pathType, highlightRange, setBrowseState, domain,
+    repoName, revisionName, path, pathType, highlightRange, setBrowseState,
 }: GetBrowsePathProps) => {
+    const domain = SINGLE_TENANT_ORG_DOMAIN;
     const params = new URLSearchParams();
 
     if (highlightRange) {
diff --git a/packages/web/src/app/[domain]/components/pathHeader.tsx b/packages/web/src/app/[domain]/components/pathHeader.tsx
index 2b4298e22..048e1d641 100644
--- a/packages/web/src/app/[domain]/components/pathHeader.tsx
+++ b/packages/web/src/app/[domain]/components/pathHeader.tsx
@@ -15,7 +15,6 @@ import {
 import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
 import { CopyIconButton } from "./copyIconButton";
 import Link from "next/link";
-import { useDomain } from "@/hooks/useDomain";
 import { CodeHostType } from "@sourcebot/db";
 
 interface FileHeaderProps {
@@ -74,8 +73,6 @@ export const PathHeader = ({
     const containerRef = useRef<HTMLDivElement>(null);
     const breadcrumbsRef = useRef<HTMLDivElement>(null);
     const [visibleSegmentCount, setVisibleSegmentCount] = useState<number | null>(null);
-    const domain = useDomain();
-
     // Create breadcrumb segments from file path
     const breadcrumbSegments = useMemo(() => {
         const pathParts = path.split('/').filter(Boolean);
@@ -223,7 +220,6 @@ export const PathHeader = ({
                     path: '/',
                     pathType: 'tree',
                     revisionName,
-                    domain,
                 })}
             >
                 {info?.displayName}
@@ -262,7 +258,6 @@ export const PathHeader = ({
                                                 path: segment.fullPath,
                                                 pathType: segment.isLastSegment ? pathType : 'tree',
                                                 revisionName,
-                                                domain,
                                             })}
                                             className="font-mono text-sm hover:cursor cursor-pointer"
                                             key={segment.fullPath}
@@ -291,7 +286,6 @@ export const PathHeader = ({
                                     path: segment.fullPath,
                                     pathType: segment.isLastSegment ? pathType : 'tree',
                                     revisionName,
-                                    domain,
                                 })}
                             >
                                 {renderSegmentWithHighlight(segment)}
diff --git a/packages/web/src/app/[domain]/repos/components/reposTable.tsx b/packages/web/src/app/[domain]/repos/components/reposTable.tsx
index 0578b95e2..1228f690e 100644
--- a/packages/web/src/app/[domain]/repos/components/reposTable.tsx
+++ b/packages/web/src/app/[domain]/repos/components/reposTable.tsx
@@ -138,7 +138,6 @@ export const getColumns = (context: ColumnsContext): ColumnDef<Repo>[] => [
                             repoName: repo.name,
                             path: '/',
                             pathType: 'tree',
-                            domain: SINGLE_TENANT_ORG_DOMAIN,
                         })}
                         className="font-medium hover:underline"
                     >
diff --git a/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx b/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
index 334333927..153f85e3c 100644
--- a/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
+++ b/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
@@ -4,7 +4,6 @@ import { SearchResultFile, SearchResultChunk } from "@/features/search";
 import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
 import Link from "next/link";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { useDomain } from "@/hooks/useDomain";
 
 
 interface FileMatchProps {
@@ -16,8 +15,6 @@ export const FileMatch = ({
     match,
     file,
 }: FileMatchProps) => {
-    const domain = useDomain();
-
     // If it's just the title, don't show a code preview
     if (match.matchRanges.length === 0) {
         return null;
@@ -32,7 +29,6 @@ export const FileMatch = ({
                 revisionName: file.branches?.[0] ?? 'HEAD',
                 path: file.fileName.text,
                 pathType: 'blob',
-                domain,
                 highlightRange: {
                     start: {
                         lineNumber: match.contentStart.lineNumber,
diff --git a/packages/web/src/app/api/(server)/repos/listReposApi.ts b/packages/web/src/app/api/(server)/repos/listReposApi.ts
index 413feccec..c85098ae5 100644
--- a/packages/web/src/app/api/(server)/repos/listReposApi.ts
+++ b/packages/web/src/app/api/(server)/repos/listReposApi.ts
@@ -54,7 +54,6 @@ export const listRepos = async ({ query, page, perPage, sort, direction, source
                     repoName: repo.name,
                     path: '',
                     pathType: 'tree',
-                    domain: org.domain,
                 })}`,
                 repoDisplayName: repo.displayName ?? undefined,
                 externalWebUrl: repo.webUrl ?? undefined,
diff --git a/packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx b/packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
index 88e212eb8..3a65d967c 100644
--- a/packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
+++ b/packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
@@ -9,7 +9,6 @@ import { useMemo, useRef } from "react";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 import { useVirtualizer } from "@tanstack/react-virtual";
 import Link from "next/link";
-import { useDomain } from "@/hooks/useDomain";
 
 interface ReferenceListProps {
     data: FindRelatedSymbolsResponse;
@@ -23,7 +22,6 @@ export const ReferenceList = ({
     data,
     revisionName,
 }: ReferenceListProps) => {
-    const domain = useDomain();
     const repoInfoMap = useMemo(() => {
         return data.repositoryInfo.reduce((acc, repo) => {
             acc[repo.id] = repo;
@@ -112,7 +110,6 @@ export const ReferenceList = ({
                                                 path: file.fileName,
                                                 pathType: 'blob',
                                                 highlightRange: match.range,
-                                                domain,
                                             })}
                                             onClick={() => {
                                                 captureEvent('wa_explore_menu_reference_clicked', {});
diff --git a/packages/web/src/features/chat/components/chatThread/tools/fileRow.tsx b/packages/web/src/features/chat/components/chatThread/tools/fileRow.tsx
index ea95cd6d6..f2485e6cb 100644
--- a/packages/web/src/features/chat/components/chatThread/tools/fileRow.tsx
+++ b/packages/web/src/features/chat/components/chatThread/tools/fileRow.tsx
@@ -2,7 +2,6 @@
 
 import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import Link from "next/link";
 
 type FileInfo = {
@@ -22,7 +21,6 @@ export const FileRow = ({ file }: { file: FileInfo }) => {
         revisionName: file.revision,
         path: file.path,
         pathType: 'blob',
-        domain: SINGLE_TENANT_ORG_DOMAIN,
     });
 
     return (
diff --git a/packages/web/src/features/chat/components/chatThread/tools/listTreeToolComponent.tsx b/packages/web/src/features/chat/components/chatThread/tools/listTreeToolComponent.tsx
index bc49c56ef..e7021c8c8 100644
--- a/packages/web/src/features/chat/components/chatThread/tools/listTreeToolComponent.tsx
+++ b/packages/web/src/features/chat/components/chatThread/tools/listTreeToolComponent.tsx
@@ -4,7 +4,6 @@ import { ListTreeMetadata, ToolResult } from "@/features/tools";
 import { RepoBadge } from "./repoBadge";
 import { Separator } from "@/components/ui/separator";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { FolderIcon } from "lucide-react";
 import Link from "next/link";
 
@@ -18,7 +17,6 @@ export const ListTreeToolComponent = ({ metadata }: ToolResult<ListTreeMetadata>
                     revisionName: metadata.ref,
                     path: metadata.path,
                     pathType: 'tree',
-                    domain: SINGLE_TENANT_ORG_DOMAIN,
                 })}
                 onClick={(e) => e.stopPropagation()}
                 className="inline-flex items-center gap-1 text-xs bg-muted hover:bg-accent px-1.5 py-0.5 rounded truncate text-foreground font-medium transition-colors min-w-0"
diff --git a/packages/web/src/features/chat/components/chatThread/tools/readFileToolComponent.tsx b/packages/web/src/features/chat/components/chatThread/tools/readFileToolComponent.tsx
index 1adfe23d7..586afc276 100644
--- a/packages/web/src/features/chat/components/chatThread/tools/readFileToolComponent.tsx
+++ b/packages/web/src/features/chat/components/chatThread/tools/readFileToolComponent.tsx
@@ -3,7 +3,6 @@
 import { ReadFileMetadata, ToolResult } from "@/features/tools";
 import { VscodeFileIcon } from "@/app/components/vscodeFileIcon";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { Separator } from "@/components/ui/separator";
 import Link from "next/link";
 import { RepoBadge } from "./repoBadge";
@@ -15,7 +14,6 @@ export const ReadFileToolComponent = ({ metadata }: ToolResult<ReadFileMetadata>
         revisionName: metadata.ref,
         path: metadata.path,
         pathType: 'blob',
-        domain: SINGLE_TENANT_ORG_DOMAIN,
         highlightRange: (metadata.isTruncated || metadata.startLine > 1) ? {
             start: { lineNumber: metadata.startLine },
             end: { lineNumber: metadata.endLine },
diff --git a/packages/web/src/features/chat/components/chatThread/tools/repoBadge.tsx b/packages/web/src/features/chat/components/chatThread/tools/repoBadge.tsx
index 68b69bfef..a5a352957 100644
--- a/packages/web/src/features/chat/components/chatThread/tools/repoBadge.tsx
+++ b/packages/web/src/features/chat/components/chatThread/tools/repoBadge.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { getCodeHostIcon } from "@/lib/utils";
 import { CodeHostType } from "@sourcebot/db";
 import Image from "next/image";
@@ -13,7 +12,6 @@ export const RepoBadge = ({ repo }: { repo: { name: string; displayName: string;
         repoName: repo.name,
         path: '',
         pathType: 'tree',
-        domain: SINGLE_TENANT_ORG_DOMAIN,
     });
 
     return (
diff --git a/packages/web/src/features/chat/components/chatThread/tools/repoHeader.tsx b/packages/web/src/features/chat/components/chatThread/tools/repoHeader.tsx
index 4ce148ca7..13f69cb42 100644
--- a/packages/web/src/features/chat/components/chatThread/tools/repoHeader.tsx
+++ b/packages/web/src/features/chat/components/chatThread/tools/repoHeader.tsx
@@ -1,7 +1,6 @@
 'use client';
 
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { cn, getCodeHostIcon } from "@/lib/utils";
 import { CodeHostType } from "@sourcebot/db";
 import Image from "next/image";
@@ -20,7 +19,6 @@ export const RepoHeader = ({ repo, repoName, isPrimary }: { repo: RepoInfo | und
         repoName: repoName,
         path: '',
         pathType: 'tree',
-        domain: SINGLE_TENANT_ORG_DOMAIN,
     });
 
     const className = cn("top-0 flex items-center gap-1.5 px-3 py-1.5 text-xs font-medium bg-popover border-b border-border",
diff --git a/packages/web/src/features/chat/utils.ts b/packages/web/src/features/chat/utils.ts
index a1c9fd9f4..c1cbaaf2f 100644
--- a/packages/web/src/features/chat/utils.ts
+++ b/packages/web/src/features/chat/utils.ts
@@ -1,5 +1,4 @@
 import { BrowseHighlightRange, getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 import { CreateUIMessage, TextUIPart, UIMessagePart } from "ai";
 import { Descendant, Editor, Point, Range, Transforms } from "slate";
 import { ANSWER_TAG, FILE_REFERENCE_PREFIX, FILE_REFERENCE_REGEX } from "./constants";
@@ -271,7 +270,6 @@ export const convertLLMOutputToPortableMarkdown = (text: string, baseUrl: string
                 repoName: repo,
                 path: fileName,
                 pathType: 'blob',
-                domain: SINGLE_TENANT_ORG_DOMAIN,
                 highlightRange,
             });
 
diff --git a/packages/web/src/features/git/getFileSourceApi.ts b/packages/web/src/features/git/getFileSourceApi.ts
index 0b0988eeb..03399d995 100644
--- a/packages/web/src/features/git/getFileSourceApi.ts
+++ b/packages/web/src/features/git/getFileSourceApi.ts
@@ -1,7 +1,6 @@
 import { sew } from "@/middleware/sew";
 import { getBrowsePath } from '@/app/[domain]/browse/hooks/utils';
 import { getAuditService } from '@/ee/features/audit/factory';
-import { SINGLE_TENANT_ORG_DOMAIN } from '@/lib/constants';
 import { parseGitAttributes, resolveLanguageFromGitAttributes } from '@/lib/gitattributes';
 import { detectLanguageFromFilename } from '@/lib/languageDetection';
 import { ServiceError, notFound, fileNotFound, invalidGitRef, unexpectedError } from '@/lib/serviceError';
@@ -90,7 +89,6 @@ export const getFileSource = async ({ path: filePath, repo: repoName, ref }: Fil
         revisionName: ref,
         path: filePath,
         pathType: 'blob',
-        domain: SINGLE_TENANT_ORG_DOMAIN,
     })}`;
 
     return {
diff --git a/packages/web/src/features/search/zoektSearcher.ts b/packages/web/src/features/search/zoektSearcher.ts
index 7203521ba..be853b02f 100644
--- a/packages/web/src/features/search/zoektSearcher.ts
+++ b/packages/web/src/features/search/zoektSearcher.ts
@@ -19,7 +19,6 @@ import { isBranchQuery, QueryIR, someInQueryIR } from './ir';
 import { RepositoryInfo, SearchResponse, SearchResultFile, SearchStats, SourceRange, StreamedSearchErrorResponse, StreamedSearchResponse } from "./types";
 import { captureEvent } from "@/lib/posthog";
 import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils";
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants";
 
 const logger = createLogger("zoekt-searcher");
 
@@ -430,7 +429,6 @@ const transformZoektSearchResponse = async (response: ZoektGrpcSearchResponse, r
                 repoName: repo.name,
                 path: fileName,
                 pathType: 'blob',
-                domain: SINGLE_TENANT_ORG_DOMAIN,
                 revisionName: branchName,
             })}`,
             externalWebUrl: getCodeHostBrowseFileAtBranchUrl({