diff --git a/apps/web/src/app/app/(primary_layout)/(chat_experience)/reports/[reportId]/page.tsx b/apps/web/src/app/app/(primary_layout)/(chat_experience)/reports/[reportId]/page.tsx
index 6247e7056..f6c0ade61 100644
--- a/apps/web/src/app/app/(primary_layout)/(chat_experience)/reports/[reportId]/page.tsx
+++ b/apps/web/src/app/app/(primary_layout)/(chat_experience)/reports/[reportId]/page.tsx
@@ -5,5 +5,5 @@ export default async function Page(props: { params: Promise<{ reportId: string }
 
   const { reportId } = params;
 
-  return <ReportPageController reportId={reportId} />;
+  return <ReportPageController reportId={reportId} mode="default" />;
 }
diff --git a/apps/web/src/components/ui/report/elements/MetricElement/MetricContent.tsx b/apps/web/src/components/ui/report/elements/MetricElement/MetricContent.tsx
index d0a059a31..688e7734e 100644
--- a/apps/web/src/components/ui/report/elements/MetricElement/MetricContent.tsx
+++ b/apps/web/src/components/ui/report/elements/MetricElement/MetricContent.tsx
@@ -10,13 +10,13 @@ export const MetricContent = React.memo(
   ({
     metricId,
     metricVersionNumber,
-    isBaseElement = false,
+    isExportMode = false,
     readOnly = false
   }: {
     metricId: string;
     metricVersionNumber: number | undefined;
     readOnly?: boolean;
-    isBaseElement?: boolean;
+    isExportMode?: boolean;
   }) => {
     const chatId = useChatLayoutContextSelector((x) => x.chatId);
     const reportId = useChatLayoutContextSelector((x) => x.reportId) || '';
@@ -24,7 +24,7 @@ export const MetricContent = React.memo(
     const ref = useRef<HTMLDivElement>(null);
 
     const [inViewport] = useInViewport(ref, {
-      threshold: isBaseElement ? 0 : 0.33
+      threshold: isExportMode ? 0 : 0.33
     });
     const renderChart = inViewport;
 
@@ -73,7 +73,7 @@ export const MetricContent = React.memo(
     return (
       <MetricCard
         metricLink={link}
-        animate={!isBaseElement}
+        animate={!isExportMode}
         metricId={metricId}
         readOnly={readOnly}
         isDragOverlay={false}
diff --git a/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx b/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx
index c61f24d2c..bc573334a 100644
--- a/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx
+++ b/apps/web/src/components/ui/report/elements/MetricElement/MetricElement.tsx
@@ -30,18 +30,15 @@ export const MetricElement = withHOC(
     const metricId = props.element.metricId;
     const metricVersionNumber = props.element.metricVersionNumber;
     const readOnly = useReadOnly();
-    console.log(props.editor.getOptionsStore(GlobalVariablePlugin));
-    console.log(props.editor.getOptions(GlobalVariablePlugin));
     const mode = props.editor.getOption(GlobalVariablePlugin, 'mode');
 
-    console.log('mode', mode);
-
     const content = metricId ? (
       <MetricResizeContainer>
         <MetricContent
           metricId={metricId}
           metricVersionNumber={metricVersionNumber}
           readOnly={readOnly}
+          isExportMode={mode === 'export'}
         />
       </MetricResizeContainer>
     ) : (
diff --git a/apps/web/src/components/ui/report/useReportEditor.tsx b/apps/web/src/components/ui/report/useReportEditor.tsx
index e099cfae2..7e6eab544 100644
--- a/apps/web/src/components/ui/report/useReportEditor.tsx
+++ b/apps/web/src/components/ui/report/useReportEditor.tsx
@@ -5,13 +5,12 @@ import { useEditorRef, usePlateEditor, type TPlateEditor } from 'platejs/react';
 import { useMemo } from 'react';
 import { EditorKit } from './editor-kit';
 import { FIXED_TOOLBAR_KIT_KEY } from './plugins/fixed-toolbar-kit';
-import { CUSTOM_KEYS } from './config/keys';
 import { GlobalVariablePlugin } from './plugins/global-variable-kit';
 
 export const useReportEditor = ({
   value,
   disabled,
-  mode,
+  mode = 'default',
   useFixedToolbarKit = false
 }: {
   value: Value;
@@ -27,13 +26,11 @@ export const useReportEditor = ({
 
     return [
       ...EditorKit,
-      GlobalVariablePlugin.configurePlugin(GlobalVariablePlugin, {
-        options: {
-          mode
-        }
+      GlobalVariablePlugin.configure({
+        options: { mode }
       })
-    ];
-  }, []);
+    ].filter((p) => !filteredKeys.includes(p.key));
+  }, [useFixedToolbarKit, mode]);
 
   return usePlateEditor({
     plugins,
diff --git a/apps/web/src/controllers/ReportPageControllers/ReportPageController.tsx b/apps/web/src/controllers/ReportPageControllers/ReportPageController.tsx
index 2cf6a4dce..61de8a4c0 100644
--- a/apps/web/src/controllers/ReportPageControllers/ReportPageController.tsx
+++ b/apps/web/src/controllers/ReportPageControllers/ReportPageController.tsx
@@ -2,7 +2,7 @@
 
 import { useGetReport, useUpdateReport } from '@/api/buster_rest/reports';
 import { cn } from '@/lib/utils';
-import React, { useEffect } from 'react';
+import React from 'react';
 import { ReportPageHeader } from './ReportPageHeader';
 import { useMemoizedFn } from '@/hooks/useMemoizedFn';
 import { useDebounceFn } from '@/hooks/useDebounce';