diff --git a/Dockerfile b/Dockerfile
index c708227b..38a2a49a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /app
 
 ENV HUSKY=0
 
-RUN git clone https://github.com/deriv-com/p2p.git .
+COPY . .
 
 RUN npm install
 
diff --git a/src/App.tsx b/src/App.tsx
index 7a490391..4614194e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,12 +3,13 @@ import { BrowserRouter } from 'react-router-dom';
 import { QueryParamProvider } from 'use-query-params';
 import { ReactRouter5Adapter } from 'use-query-params/adapters/react-router-5';
 import { AppFooter, AppHeader, DerivIframe, ErrorBoundary } from '@/components';
-import { useDerivAnalytics, useRedirectToOauth, useTrackjs } from '@/hooks';
+import { useDerivAnalytics, useOAuth, useTrackjs } from '@/hooks';
 import AppContent from '@/routes/AppContent';
 import { initializeI18n, TranslationProvider } from '@deriv-com/translations';
 import { Loader, useDevice } from '@deriv-com/ui';
 import { URLConstants } from '@deriv-com/utils';
 import useGrowthbookGetFeatureValue from './hooks/custom-hooks/useGrowthbookGetFeatureValue';
+import useOAuth2Enabled from './hooks/custom-hooks/useOAuth2Enabled';
 
 const { VITE_CROWDIN_BRANCH_NAME, VITE_PROJECT_NAME, VITE_TRANSLATIONS_CDN_URL } = process.env;
 const i18nInstance = initializeI18n({
@@ -19,14 +20,15 @@ const App = () => {
     const [ShouldRedirectToDerivApp, isGBLoaded] = useGrowthbookGetFeatureValue({
         featureFlag: 'redirect_to_deriv_app_p2p',
     });
+    const [isOAuth2Enabled] = useOAuth2Enabled();
+    const { onRenderAuthCheck } = useOAuth();
     const { init: initTrackJS } = useTrackjs();
     const { isDesktop } = useDevice();
-    const { redirectToOauth } = useRedirectToOauth();
     const { initialise: initDerivAnalytics } = useDerivAnalytics();
 
     initTrackJS();
     initDerivAnalytics();
-    redirectToOauth();
+    onRenderAuthCheck();
 
     useEffect(() => {
         if (isGBLoaded && ShouldRedirectToDerivApp) {
@@ -42,7 +44,7 @@ const App = () => {
                 <QueryParamProvider adapter={ReactRouter5Adapter}>
                     <TranslationProvider defaultLang='EN' i18nInstance={i18nInstance}>
                         <Suspense fallback={<Loader isFullScreen />}>
-                            <DerivIframe />
+                            {!isOAuth2Enabled && <DerivIframe />}
                             <AppHeader />
                             <AppContent />
                             {isDesktop && <AppFooter />}
diff --git a/src/components/AppHeader/AppHeader.tsx b/src/components/AppHeader/AppHeader.tsx
index bd496b66..aa9b3846 100644
--- a/src/components/AppHeader/AppHeader.tsx
+++ b/src/components/AppHeader/AppHeader.tsx
@@ -1,5 +1,5 @@
 import { getOauthUrl } from '@/constants';
-import { api, useRedirectToOauth } from '@/hooks';
+import { api, useOAuth } from '@/hooks';
 import { getCurrentRoute } from '@/utils';
 import { StandaloneCircleUserRegularIcon } from '@deriv/quill-icons';
 import { useAuthData } from '@deriv-com/api-hooks';
@@ -19,11 +19,11 @@ import './AppHeader.scss';
 const AppHeader = () => {
     const { isDesktop } = useDevice();
     const isEndpointPage = getCurrentRoute() === 'endpoint';
-    const { redirectToOauth } = useRedirectToOauth();
-    const { activeLoginid, logout } = useAuthData();
+    const { activeLoginid } = useAuthData();
     const { data: activeAccount } = api.account.useActiveAccount();
     const { localize } = useTranslations();
     const oauthUrl = getOauthUrl();
+    const { oAuthLogout } = useOAuth();
 
     const renderAccountSection = () => {
         if (!isEndpointPage && !activeAccount) {
@@ -47,14 +47,7 @@ const AppHeader = () => {
                         </TooltipMenuIcon>
                     )}
                     <AccountSwitcher account={activeAccount!} />
-                    <Button
-                        className='mr-6'
-                        onClick={async () => {
-                            await logout();
-                            redirectToOauth();
-                        }}
-                        size='md'
-                    >
+                    <Button className='mr-6' onClick={oAuthLogout} size='md'>
                         <Text size='sm' weight='bold'>
                             {localize('Logout')}
                         </Text>
@@ -65,7 +58,7 @@ const AppHeader = () => {
 
         return (
             <Button
-                className='min-w-36'
+                className='w-36'
                 color='primary-light'
                 onClick={() => window.open(oauthUrl, '_self')}
                 variant='ghost'
diff --git a/src/components/AppHeader/MobileMenu/MobileMenuConfig.tsx b/src/components/AppHeader/MobileMenu/MobileMenuConfig.tsx
index 6fa9a348..9b97d167 100644
--- a/src/components/AppHeader/MobileMenu/MobileMenuConfig.tsx
+++ b/src/components/AppHeader/MobileMenu/MobileMenuConfig.tsx
@@ -1,6 +1,6 @@
 import { ComponentProps, ReactNode } from 'react';
 import { ACCOUNT_LIMITS, HELP_CENTRE, RESPONSIBLE } from '@/constants';
-import { useLiveChat } from '@/hooks/custom-hooks';
+import { useLiveChat, useOAuth } from '@/hooks/custom-hooks';
 import {
     BrandDerivLogoCoralIcon,
     IconTypes,
@@ -16,7 +16,6 @@ import {
     LegacyResponsibleTradingIcon,
     LegacyWhatsappIcon,
 } from '@deriv/quill-icons';
-import { useAuthData } from '@deriv-com/api-hooks';
 import { useTranslations } from '@deriv-com/translations';
 import { URLConstants } from '@deriv-com/utils';
 
@@ -36,7 +35,7 @@ type TMenuConfig = {
 
 export const MobileMenuConfig = () => {
     const { localize } = useTranslations();
-    const { logout } = useAuthData();
+    const { oAuthLogout } = useOAuth();
     const { LiveChatWidget } = useLiveChat();
 
     const menuConfig: TMenuConfig[] = [
@@ -125,8 +124,8 @@ export const MobileMenuConfig = () => {
                 as: 'button',
                 label: localize('Log out'),
                 LeftComponent: LegacyLogout1pxIcon,
-                onClick: async () => {
-                    await logout();
+                onClick: () => {
+                    oAuthLogout();
                 },
                 removeBorderBottom: true,
             },
diff --git a/src/constants/url.ts b/src/constants/url.ts
index fbc1d78d..2a6bb64f 100644
--- a/src/constants/url.ts
+++ b/src/constants/url.ts
@@ -14,12 +14,24 @@ export const DERIV_COM = URLConstants.derivComProduction;
 export const HELP_CENTRE = `${URLConstants.derivComProduction}/help-centre/`;
 export const RESPONSIBLE = `${URLConstants.derivComProduction}/responsible/`;
 
+export const INTRODUCING_DERIV_P2P_URL =
+    'https://player.vimeo.com/video/715973569?color&autopause=0&loop=0&muted=0&title=0&portrait=0&autoplay=1&byline=0#t=';
+
+export const HOW_TO_USE_DERIV_P2P_URL =
+    'https://player.vimeo.com/video/715982928?color&autopause=0&loop=0&muted=0&title=0&portrait=0&autoplay=1&byline=0#t=';
+
+export const HOW_TO_PROTECT_YOURSELF_URL = 'https://blog.deriv.com/posts/how-to-protect-yourself-on-p2p-platforms/';
+
+export const DEFAULT_OAUTH_LOGOUT_URL = 'https://oauth.deriv.com/oauth2/sessions/logout';
+
+export const DEFAULT_OAUTH_ORIGIN_URL = 'https://oauth.deriv.com';
+
 const SocketURL = {
     [URLConstants.derivP2pProduction]: 'blue.derivws.com',
     [URLConstants.derivP2pStaging]: 'red.derivws.com',
 };
 
-export const getOauthUrl = () => {
+export const getServerInfo = () => {
     const origin = window.location.origin;
     const hostname = window.location.hostname;
 
@@ -45,6 +57,16 @@ export const getOauthUrl = () => {
     const appId = LocalStorageUtils.getValue<string>(LocalStorageConstants.configAppId);
     const lang = LocalStorageUtils.getValue<string>(LocalStorageConstants.i18nLanguage);
 
+    return {
+        appId,
+        lang,
+        serverUrl,
+    };
+};
+
+export const getOauthUrl = () => {
+    const { appId, lang, serverUrl } = getServerInfo();
+
     const oauthUrl =
         appId && serverUrl
             ? `https://${serverUrl}/oauth2/authorize?app_id=${appId}&l=${lang ?? 'EN'}&&brand=deriv`
@@ -53,10 +75,18 @@ export const getOauthUrl = () => {
     return oauthUrl;
 };
 
-export const INTRODUCING_DERIV_P2P_URL =
-    'https://player.vimeo.com/video/715973569?color&autopause=0&loop=0&muted=0&title=0&portrait=0&autoplay=1&byline=0#t=';
+export const getOAuthLogoutUrl = () => {
+    const { appId, serverUrl } = getServerInfo();
 
-export const HOW_TO_USE_DERIV_P2P_URL =
-    'https://player.vimeo.com/video/715982928?color&autopause=0&loop=0&muted=0&title=0&portrait=0&autoplay=1&byline=0#t=';
+    const oauthUrl = appId && serverUrl ? `https://${serverUrl}/oauth2/sessions/logout` : DEFAULT_OAUTH_LOGOUT_URL;
 
-export const HOW_TO_PROTECT_YOURSELF_URL = 'https://blog.deriv.com/posts/how-to-protect-yourself-on-p2p-platforms/';
+    return oauthUrl;
+};
+
+export const getOAuthOrigin = () => {
+    const { appId, serverUrl } = getServerInfo();
+
+    const oauthUrl = appId && serverUrl ? `https://${serverUrl}` : DEFAULT_OAUTH_ORIGIN_URL;
+
+    return oauthUrl;
+};
diff --git a/src/hooks/custom-hooks/__tests__/useOAuth2Enabled.spec.ts b/src/hooks/custom-hooks/__tests__/useOAuth2Enabled.spec.ts
new file mode 100644
index 00000000..c0cc8e33
--- /dev/null
+++ b/src/hooks/custom-hooks/__tests__/useOAuth2Enabled.spec.ts
@@ -0,0 +1,39 @@
+import { renderHook } from '@testing-library/react';
+import useGrowthbookGetFeatureValue from '../useGrowthbookGetFeatureValue';
+import useOAuth2Enabled from '../useOAuth2Enabled';
+
+jest.mock('@/constants', () => ({
+    getServerInfo: jest.fn(() => ({
+        appId: '111', // emulate local appId
+    })),
+}));
+
+jest.mock('../useGrowthbookGetFeatureValue');
+
+describe('useOAuth2Enabled', () => {
+    it('OAuth 2 enabled', () => {
+        const emulateAppIdAvailable = [
+            {},
+            {
+                enabled_for: [111],
+            },
+        ];
+        (useGrowthbookGetFeatureValue as jest.Mock).mockReturnValue([emulateAppIdAvailable, true]);
+        const { result } = renderHook(() => useOAuth2Enabled());
+
+        expect(result.current).toStrictEqual([true]);
+    });
+
+    it('OAuth 2 disabled', () => {
+        const emulateAppIdAvailable = [
+            {},
+            {
+                enabled_for: [112],
+            },
+        ];
+        (useGrowthbookGetFeatureValue as jest.Mock).mockReturnValue([emulateAppIdAvailable, true]);
+        const { result } = renderHook(() => useOAuth2Enabled());
+
+        expect(result.current).toStrictEqual([false]);
+    });
+});
diff --git a/src/hooks/custom-hooks/index.ts b/src/hooks/custom-hooks/index.ts
index 4b22f763..e1dd0561 100644
--- a/src/hooks/custom-hooks/index.ts
+++ b/src/hooks/custom-hooks/index.ts
@@ -14,9 +14,9 @@ export { default as useLiveChat } from './useLiveChat';
 export { default as useModalManager } from './useModalManager';
 export { default as useNavigatorOnline } from './useNavigatorOnline';
 export { default as useNetworkStatus } from './useNetworkStatus';
+export { default as useOAuth } from './useOAuth';
 export { default as usePoiPoaStatus } from './usePoiPoaStatus';
 export { default as useQueryString } from './useQueryString';
-export { default as useRedirectToOauth } from './useRedirectToOauth';
 export { default as useSendbird } from './useSendbird';
 export { default as useSyncedTime } from './useSyncedTime';
 export { default as useTrackjs } from './useTrackjs';
diff --git a/src/hooks/custom-hooks/useDerivAnalytics.ts b/src/hooks/custom-hooks/useDerivAnalytics.ts
index d84b1188..04bbbcd9 100644
--- a/src/hooks/custom-hooks/useDerivAnalytics.ts
+++ b/src/hooks/custom-hooks/useDerivAnalytics.ts
@@ -19,10 +19,9 @@ const useDerivAnalytics = () => {
     const initialise = async () => {
         try {
             const isDerivAnalyticsInitialized = Analytics?.getInstances()?.tracking?.has_initialized;
-            const isLocalHost = location.hostname === 'localhost';
             const isProduction = process.env.NODE_ENV === 'production';
 
-            if (!isLocalHost && !isDerivAnalyticsInitialized && websiteStatus) {
+            if (!isDerivAnalyticsInitialized && websiteStatus) {
                 const remoteConfigURL = process.env.VITE_REMOTE_CONFIG_URL;
                 let services = FIREBASE_INIT_DATA;
                 if (remoteConfigURL) {
diff --git a/src/hooks/custom-hooks/useGrowthbookGetFeatureValue.tsx b/src/hooks/custom-hooks/useGrowthbookGetFeatureValue.tsx
index 125a73bc..529e7675 100644
--- a/src/hooks/custom-hooks/useGrowthbookGetFeatureValue.tsx
+++ b/src/hooks/custom-hooks/useGrowthbookGetFeatureValue.tsx
@@ -2,18 +2,20 @@ import { useEffect, useState } from 'react';
 import { Analytics } from '@deriv-com/analytics';
 import useIsGrowthbookIsLoaded from './useIsGrowthbookLoaded';
 
-interface UseGrowthbookGetFeatureValueArgs<T> {
-    defaultValue?: T;
+type featureValueTypes = Record<string, boolean> | boolean | string | [];
+
+interface UseGrowthbookGetFeatureValueArgs {
+    defaultValue?: featureValueTypes;
     featureFlag: string;
 }
 
-const useGrowthbookGetFeatureValue = <T extends boolean | string>({
+const useGrowthbookGetFeatureValue = <T,>({
     defaultValue,
     featureFlag,
-}: UseGrowthbookGetFeatureValueArgs<T>) => {
-    const resolvedDefaultValue: T = defaultValue !== undefined ? defaultValue : (false as T);
-    const [featureFlagValue, setFeatureFlagValue] = useState(
-        Analytics?.getFeatureValue(featureFlag, resolvedDefaultValue) ?? resolvedDefaultValue
+}: UseGrowthbookGetFeatureValueArgs): [T, boolean] => {
+    const resolvedDefaultValue: featureValueTypes = defaultValue !== undefined ? defaultValue : false;
+    const [featureFlagValue, setFeatureFlagValue] = useState<T>(
+        (Analytics?.getFeatureValue(featureFlag, resolvedDefaultValue) ?? resolvedDefaultValue) as T
     );
     const isGBLoaded = useIsGrowthbookIsLoaded();
 
@@ -21,7 +23,7 @@ const useGrowthbookGetFeatureValue = <T extends boolean | string>({
         if (isGBLoaded) {
             if (Analytics?.getInstances()?.ab) {
                 const setFeatureValue = () => {
-                    const value = Analytics?.getFeatureValue(featureFlag, resolvedDefaultValue);
+                    const value = Analytics?.getFeatureValue(featureFlag, resolvedDefaultValue) as T;
                     setFeatureFlagValue(value);
                 };
                 setFeatureValue();
@@ -33,7 +35,7 @@ const useGrowthbookGetFeatureValue = <T extends boolean | string>({
         }
     }, [isGBLoaded, resolvedDefaultValue, featureFlag]);
 
-    return [featureFlagValue, isGBLoaded];
+    return [featureFlagValue as T, isGBLoaded];
 };
 
 export default useGrowthbookGetFeatureValue;
diff --git a/src/hooks/custom-hooks/useOAuth.ts b/src/hooks/custom-hooks/useOAuth.ts
new file mode 100644
index 00000000..de3133a5
--- /dev/null
+++ b/src/hooks/custom-hooks/useOAuth.ts
@@ -0,0 +1,99 @@
+import { useCallback, useEffect } from 'react';
+import { getOAuthLogoutUrl, getOAuthOrigin, getOauthUrl } from '@/constants';
+import { getCurrentRoute } from '@/utils';
+import { useAuthData } from '@deriv-com/api-hooks';
+import useOAuth2Enabled from './useOAuth2Enabled';
+
+type MessageEvent = {
+    data: 'logout_complete' | 'logout_error';
+    origin: string;
+};
+
+type UseOAuthReturn = {
+    oAuthLogout: () => void;
+    onRenderAuthCheck: () => void;
+};
+
+/**
+ * useOAuth - hooks to help with OAuth function such as logout and check auth state during render
+ *
+ * @returns {UseOAuthReturn}
+ */
+const useOAuth = (): UseOAuthReturn => {
+    const [isOAuth2Enabled] = useOAuth2Enabled();
+    const { logout } = useAuthData();
+    const { error, isAuthorized, isAuthorizing } = useAuthData();
+    const isEndpointPage = getCurrentRoute() === 'endpoint';
+    const oauthUrl = getOauthUrl();
+
+    const WSLogoutAndRedirect = async () => {
+        await logout();
+        window.open(oauthUrl, '_self');
+    };
+
+    useEffect(() => {
+        const onMessage = async (event: MessageEvent) => {
+            const allowedOrigin = getOAuthOrigin();
+            if (allowedOrigin === event.origin) {
+                if (event.data === 'logout_complete') {
+                    WSLogoutAndRedirect();
+                } else {
+                    // eslint-disable-next-line no-console
+                    console.warn('Unexpected message received: ', event.data);
+                }
+            } else {
+                // eslint-disable-next-line no-console
+                console.warn('Unexpected postmessage origin: ', event.origin);
+            }
+        };
+
+        window.addEventListener('message', onMessage);
+
+        return () => {
+            window.removeEventListener('message', onMessage);
+        };
+    }, []);
+
+    const OAuth2Logout = async () => {
+        let iframe: HTMLIFrameElement | null = document.getElementById('logout-iframe') as HTMLIFrameElement;
+        if (!iframe) {
+            iframe = document.createElement('iframe');
+            iframe.id = 'logout-iframe';
+            iframe.style.display = 'none';
+            document.body.appendChild(iframe);
+
+            // backend response message timeout, setting this as 10 seconds
+            setTimeout(() => {
+                WSLogoutAndRedirect();
+            }, 10000);
+        }
+
+        iframe.src = getOAuthLogoutUrl();
+
+        iframe.onerror = error => {
+            // eslint-disable-next-line no-console
+            console.error('There has been a problem with the logout: ', error);
+        };
+    };
+
+    const oAuthLogout = useCallback(async () => {
+        if (isOAuth2Enabled) {
+            OAuth2Logout();
+        } else {
+            WSLogoutAndRedirect();
+        }
+    }, [isOAuth2Enabled]);
+
+    const onRenderAuthCheck = useCallback(() => {
+        if (
+            (!isEndpointPage && !isAuthorized && !isAuthorizing) ||
+            (!isEndpointPage && error?.code === 'InvalidToken')
+        ) {
+            oAuthLogout();
+        }
+    }, [isEndpointPage, isAuthorized, isAuthorizing, error, oAuthLogout]);
+
+    return { oAuthLogout, onRenderAuthCheck };
+};
+
+export default useOAuth;
diff --git a/src/hooks/custom-hooks/useOAuth2Enabled.ts b/src/hooks/custom-hooks/useOAuth2Enabled.ts
new file mode 100644
index 00000000..403925a2
--- /dev/null
+++ b/src/hooks/custom-hooks/useOAuth2Enabled.ts
@@ -0,0 +1,41 @@
+import { useEffect, useState } from 'react';
+import { getServerInfo } from '@/constants';
+import useGrowthbookGetFeatureValue from './useGrowthbookGetFeatureValue';
+
+type hydraBEValue = {
+    // list of app ids having oauth2 enabled
+    disabled_for: string[];
+    enabled_for: number[]; // list of blocked app ids
+    official_apps_enabled: boolean;
+};
+
+type hydraBEApps = [
+    null, // this value is used by BE
+    hydraBEValue,
+];
+
+/**
+ * useOAuth2Enabled - hooks to indicate if oauth 2 is enable for the app
+ *
+ * @returns [boolean]
+ */
+const useOAuth2Enabled = () => {
+    const [OAuth2EnabledApps, OAuth2EnabledAppsInitialised] = useGrowthbookGetFeatureValue<hydraBEApps>({
+        featureFlag: 'hydra_be',
+    });
+    const [isOauth2Enabled, setIsOauth2Enabled] = useState<boolean>(false);
+    const { appId } = getServerInfo();
+
+    useEffect(() => {
+        if (OAuth2EnabledAppsInitialised) {
+            const FEHydraAppIds = OAuth2EnabledApps.length
+                ? OAuth2EnabledApps[OAuth2EnabledApps.length - 1]?.enabled_for ?? []
+                : [];
+            setIsOauth2Enabled(FEHydraAppIds.includes(+(appId as string)));
+        }
+    }, [OAuth2EnabledAppsInitialised, OAuth2EnabledApps]);
+
+    return [isOauth2Enabled];
+};
+
+export default useOAuth2Enabled;
diff --git a/src/hooks/custom-hooks/useRedirectToOauth.ts b/src/hooks/custom-hooks/useRedirectToOauth.ts
deleted file mode 100644
index f1f250a7..00000000
--- a/src/hooks/custom-hooks/useRedirectToOauth.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { getOauthUrl } from '@/constants';
-import { getCurrentRoute } from '@/utils';
-import { useAuthData } from '@deriv-com/api-hooks';
-import useGrowthbookGetFeatureValue from './useGrowthbookGetFeatureValue';
-
-const useRedirectToOauth = () => {
-    const [shouldRedirect, setShouldRedirect] = useState(false);
-    const { error, isAuthorized, isAuthorizing } = useAuthData();
-    const isEndpointPage = getCurrentRoute() === 'endpoint';
-    const oauthUrl = getOauthUrl();
-
-    const [isOauth2Enabled, isGBLoaded] = useGrowthbookGetFeatureValue<boolean>({
-        defaultValue: false,
-        featureFlag: 'oauth2_service_enabled',
-    });
-
-    const redirectToOauth = useCallback(() => {
-        // Testing the use of the iframe element
-        if (shouldRedirect) {
-            if (isOauth2Enabled && isGBLoaded) {
-                let iframe = document.getElementById('logout-iframe') as HTMLIFrameElement;
-
-                if (!iframe) {
-                    iframe = document.createElement('iframe');
-                    iframe.id = 'logout-iframe';
-                    iframe.style.display = 'none';
-                    document.body.appendChild(iframe);
-                }
-
-                iframe.src = 'https://qa101.deriv.dev/oauth2/sessions/logout';
-
-                iframe.onload = () => {
-                    window.location.href = oauthUrl;
-                };
-            } else {
-                window.open(oauthUrl, '_self');
-            }
-        }
-    }, [isGBLoaded, isOauth2Enabled, oauthUrl, shouldRedirect]);
-
-    useEffect(() => {
-        if (
-            (!isEndpointPage && !isAuthorized && !isAuthorizing) ||
-            (!isEndpointPage && error?.code === 'InvalidToken')
-        ) {
-            setShouldRedirect(true);
-        }
-    }, [error, isAuthorized, isAuthorizing, isEndpointPage, oauthUrl]);
-
-    useEffect(() => {
-        if (isGBLoaded) redirectToOauth();
-    }, [isGBLoaded, redirectToOauth]);
-
-    return {
-        redirectToOauth,
-    };
-};
-
-export default useRedirectToOauth;
diff --git a/src/hooks/custom-hooks/useTrackjs.ts b/src/hooks/custom-hooks/useTrackjs.ts
index db9c7427..83f9bc20 100644
--- a/src/hooks/custom-hooks/useTrackjs.ts
+++ b/src/hooks/custom-hooks/useTrackjs.ts
@@ -9,13 +9,14 @@ const { VITE_TRACKJS_TOKEN } = process.env;
  */
 const useTrackjs = () => {
     const { activeLoginid } = useAuthData();
+    const isProduction = process.env.NODE_ENV === 'production';
     const init = () => {
         try {
             if (!TrackJS.isInstalled()) {
                 TrackJS.install({
                     application: 'p2p',
                     dedupe: false,
-                    enabled: location.hostname !== 'localhost',
+                    enabled: isProduction,
                     token: VITE_TRACKJS_TOKEN!,
                     userId: activeLoginid ?? 'undefined',
                     version: (document.querySelector('meta[name=version]') as HTMLMetaElement)?.content ?? 'undefined',