diff --git a/new-branding/src/app/layout.tsx b/new-branding/src/app/layout.tsx
index 8c0c21e..e098b09 100644
--- a/new-branding/src/app/layout.tsx
+++ b/new-branding/src/app/layout.tsx
@@ -1,5 +1,7 @@
 import type { Metadata } from "next";
 import { Analytics } from "@vercel/analytics/next";
+
+const isVercel = process.env.VERCEL === "1";
 import ToasterClient from "@/components/common/ToasterClient";
 import { KeyboardDetector } from "@/lib/hooks/KeyboardDetector";
 import QueryProvider from "@/app/providers/QueryProvider";
@@ -65,7 +67,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
         <QueryProvider>
           <KeyboardDetector />
           {children}
-          <Analytics />
+          {isVercel && <Analytics />}
           <ToasterClient />
         </QueryProvider>
       </body>
diff --git a/new-branding/src/lib/axios/index.ts b/new-branding/src/lib/axios/index.ts
index 42b306c..e4fc371 100644
--- a/new-branding/src/lib/axios/index.ts
+++ b/new-branding/src/lib/axios/index.ts
@@ -7,8 +7,10 @@ export type ApiError = {
 
 const errorHandler = <T>(error: AxiosError<T>): Promise<never> => Promise.reject(error);
 
+const cmsBase = process.env.NEXT_PUBLIC_CMS_API_URL?.replace(/\/$/, "") || "";
+
 export const axiosInstance: AxiosInstance = axios.create({
-  baseURL: "/api",
+  baseURL: `${cmsBase}/api`,
 });
 
 axiosInstance.interceptors.request.use(request => request, errorHandler);