diff --git a/trpc/client.ts b/trpc/client.ts
index 9270270..574d56d 100644
--- a/trpc/client.ts
+++ b/trpc/client.ts
@@ -5,10 +5,10 @@ import type { AppRouter } from './routers';
 
 function getBaseUrl() {
   if (typeof window !== 'undefined') {
-    return '';
+    return process.env.NEXT_PUBLIC_BASE_PATH ?? '';
   }
 
-  return `http://localhost:${process.env.PORT ?? 3000}`;
+  return `http://localhost:${process.env.PORT ?? 3000}${process.env.NEXT_PUBLIC_BASE_PATH ?? ''}`;
 }
 
 export const trpcClient = createTRPCNext<AppRouter>({