diff --git a/next.config.js b/next.config.js
index b521a8d58..6e13ab3fd 100644
--- a/next.config.js
+++ b/next.config.js
@@ -13,7 +13,7 @@ const nextConfig = {
 	// VERCEL_ENV is a system env var set by Vercel
 	// https://vercel.com/docs/projects/environment-variables/system-environment-variables
 	// basePath: process.env.VERCEL_ENV === 'production' ? '/docs' : '',
-	basePath: '/docs',
+	basePath: process.env.VERCEL_ENV === 'production' ? '/docs' : '',
 	// async redirects() {
 	// 	return [
 	// 		...updatedRedirectsData,
diff --git a/src/components/Logo.tsx b/src/components/Logo.tsx
index 1e11b6b7c..acaff9d34 100644
--- a/src/components/Logo.tsx
+++ b/src/components/Logo.tsx
@@ -5,12 +5,12 @@ export function Logo(props: React.ComponentPropsWithoutRef<'svg'>) {
 		<>
 			<img
 				className="hidden h-[23px] w-[190px] dark:block"
-				src={`/docs/logo-theme-dark.svg`}
+				src={`${basePath}/logo-theme-dark.svg`}
 				alt="Sourcegraph Docs"
 			/>
 			<img
 				className="block h-[23px] w-[190px] dark:hidden"
-				src={`/docs/logo-theme-light.svg`}
+				src={`${basePath}/logo-theme-light.svg`}
 				alt="Sourcegraph Docs"
 			/>
 		</>