diff --git a/apps/frontend/src/app/(app)/layout.tsx b/apps/frontend/src/app/(app)/layout.tsx
index e30d05f2..bea3e05e 100644
--- a/apps/frontend/src/app/(app)/layout.tsx
+++ b/apps/frontend/src/app/(app)/layout.tsx
@@ -18,13 +18,13 @@ import { FacebookComponent } from '@gitroom/frontend/components/layout/facebook.
 import { headers } from 'next/headers';
 import { headerName } from '@gitroom/react/translation/i18n.config';
 import { HtmlComponent } from '@gitroom/frontend/components/layout/html.component';
-import dynamicLoad from 'next/dynamic';
-const SetTimezone = dynamicLoad(
-  () => import('@gitroom/frontend/components/layout/set.timezone'),
-  {
-    ssr: false,
-  }
-);
+// import dynamicLoad from 'next/dynamic';
+// const SetTimezone = dynamicLoad(
+//   () => import('@gitroom/frontend/components/layout/set.timezone'),
+//   {
+//     ssr: false,
+//   }
+// );
 
 const jakartaSans = Plus_Jakarta_Sans({
   weight: ['600', '500'],
@@ -79,7 +79,7 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
           }
         >
           <SentryComponent>
-            <SetTimezone />
+            {/*<SetTimezone />*/}
             <HtmlComponent />
             <ToltScript />
             <FacebookComponent />
diff --git a/apps/frontend/src/components/layout/set.timezone.tsx b/apps/frontend/src/components/layout/set.timezone.tsx
index 1835b96e..f37b4f0f 100644
--- a/apps/frontend/src/components/layout/set.timezone.tsx
+++ b/apps/frontend/src/components/layout/set.timezone.tsx
@@ -16,7 +16,7 @@ export const getTimezone = () => {
 };
 
 export const newDayjs = (config?: ConfigType) => {
-  return dayjs.tz(config, getTimezone());
+  return dayjs(config);
 };
 
 const SetTimezone: FC = () => {
diff --git a/apps/frontend/src/components/settings/metric.component.tsx b/apps/frontend/src/components/settings/metric.component.tsx
index d91ae891..23096d49 100644
--- a/apps/frontend/src/components/settings/metric.component.tsx
+++ b/apps/frontend/src/components/settings/metric.component.tsx
@@ -11,6 +11,7 @@ const dateMetrics = [
 
 import dayjs from 'dayjs';
 import timezone from 'dayjs/plugin/timezone';
+import { timezoneSaver } from '@gitroom/frontend/components/layout/set.timezone';
 dayjs.extend(timezone);
 
 const MetricComponent = () => {
@@ -46,23 +47,23 @@ const MetricComponent = () => {
         ))}
       </Select>
 
-      <div className="mt-[4px]">Current Timezone</div>
-      <Select
-        name="timezone"
-        disableForm={true}
-        label=""
-        onChange={changeTimezone}
-      >
-        {timezones.map((metric) => (
-          <option
-            key={metric.name}
-            value={metric.tzCode}
-            selected={metric.tzCode === timezone}
-          >
-            {metric.label}
-          </option>
-        ))}
-      </Select>
+      {/*<div className="mt-[4px]">Current Timezone</div>*/}
+      {/*<Select*/}
+      {/*  name="timezone"*/}
+      {/*  disableForm={true}*/}
+      {/*  label=""*/}
+      {/*  onChange={changeTimezone}*/}
+      {/*>*/}
+      {/*  {timezones.map((metric) => (*/}
+      {/*    <option*/}
+      {/*      key={metric.name}*/}
+      {/*      value={metric.tzCode}*/}
+      {/*      selected={metric.tzCode === timezone}*/}
+      {/*    >*/}
+      {/*      {metric.label}*/}
+      {/*    </option>*/}
+      {/*  ))}*/}
+      {/*</Select>*/}
     </div>
   );
 };