diff --git a/frontend/src/components/documents/DocumentEditor.jsx b/frontend/src/components/documents/DocumentEditor.jsx
index ac40b33..8e582e8 100644
--- a/frontend/src/components/documents/DocumentEditor.jsx
+++ b/frontend/src/components/documents/DocumentEditor.jsx
@@ -11,19 +11,10 @@ export default function DocumentEditor({ document, onDocumentUpdate, onFetchCont
   const [saveStatus, setSaveStatus] = useState('saved');
   const [changeCounter, setChangeCounter] = useState(document.type == "markdown" ? -1 : -3);
   const [isLoadingContent, setIsLoadingContent] = useState(false);
-  const excalidrawRef = useRef(null);
   const saveTimeoutRef = useRef(null);
-  const contentRef = useRef(content);
 
-  // Keep contentRef in sync with content
-  useEffect(() => {
-    contentRef.current = content;
-  }, [content]);
-
-  // Fetch content if not loaded
   useEffect(() => {
     const loadContent = async () => {
-      // Check if content is missing
       if (!document.content && onFetchContent) {
         setIsLoadingContent(true);
         try {
@@ -52,41 +43,25 @@ export default function DocumentEditor({ document, onDocumentUpdate, onFetchCont
       let contentToSave;
 
       if (document.type === "whiteboard") {
-        // Get current scene data from Excalidraw ref
-        if (!excalidrawRef.current) {
-          throw new Error("Excalidraw API not available");
-        }
-
-        const sceneData = {
-          elements: excalidrawRef.current.getSceneElements(),
-          appState: excalidrawRef.current.getAppState(),
-          files: excalidrawRef.current.getFiles(),
-        };
-
-        const b64image = await generateExcalidrawImageBase64(sceneData);
+        const b64image = await generateExcalidrawImageBase64(content);
         contentToSave = {
-          raw: sceneData,
+          raw: content,
           image: b64image
         };
       } else {
         contentToSave = {
-          markdown: contentRef.current,
+          markdown: content,
         };
       }
 
-      console.log('Saving content:', contentToSave);
-
       await axios.put(
         `/api/v1/projects/${document.project_id}/documents/${document.id}`,
         { content: contentToSave },
         { withCredentials: true }
       );
 
-      console.log('Save successful');
-      // After successful save:
       setSaveStatus('saved');
 
-      // Update document in store
       if (onDocumentUpdate) {
         onDocumentUpdate(document.id, { content: contentToSave });
       }
@@ -95,9 +70,8 @@ export default function DocumentEditor({ document, onDocumentUpdate, onFetchCont
       setSaveStatus('unsaved');
       toast.error(`Failed to save document: ${error.response?.data?.detail || error.message}`);
     }
-  }, [document.project_id, document.id, excalidrawRef, onDocumentUpdate]);
+  }, [content, document.project_id, document.id, onDocumentUpdate]);
 
-  // Auto-save with debounce
   useEffect(() => {
     if (changeCounter > 0 && saveStatus === 'unsaved') {
       if (saveTimeoutRef.current) {
@@ -114,7 +88,7 @@ export default function DocumentEditor({ document, onDocumentUpdate, onFetchCont
         clearTimeout(saveTimeoutRef.current);
       }
     };
-  }, [changeCounter, performSave]);
+  }, [changeCounter, performSave, saveStatus]);
 
   const excalidrawInitialData = useMemo(() => {
     if (!document.content) return null;
@@ -153,7 +127,6 @@ export default function DocumentEditor({ document, onDocumentUpdate, onFetchCont
             initialData={excalidrawInitialData}
             onChange={handleChange}
             readOnly={false}
-            excalidrawRef={excalidrawRef}
           />
         )
       }
diff --git a/frontend/src/components/editors/ExcalidrawEditor.jsx b/frontend/src/components/editors/ExcalidrawEditor.jsx
index e2ab8cd..7f755ac 100644
--- a/frontend/src/components/editors/ExcalidrawEditor.jsx
+++ b/frontend/src/components/editors/ExcalidrawEditor.jsx
@@ -1,4 +1,4 @@
-import React, { Suspense, useCallback, useEffect, useRef, useState, useMemo } from "react";
+import React, { Suspense, useCallback, useEffect, useState } from "react";
 import { exportToBlob } from "@excalidraw/excalidraw";
 import { useTheme } from "next-themes";
 
@@ -22,10 +22,6 @@ function sanitizeInitialData(data) {
   return { ...data, appState: sanitizeAppState(data.appState) };
 }
 
-function makeSnapshot(elements, appState, files) {
-  return { type: "excalidraw", version: 2, source: "ui", elements, appState: sanitizeAppState(appState), files };
-}
-
 
 export async function generateExcalidrawImageBase64(excalidrawData, options = {}) {
   const {
@@ -66,10 +62,11 @@ export async function generateExcalidrawImageBase64(excalidrawData, options = {}
 const UIOptions = { canvasActions: { export: false, loadScene: false } }
 
 
-export default function ExcalidrawEditor({ initialData, onChange, readOnly, excalidrawRef }) {
+export default function ExcalidrawEditor({ initialData, onChange, readOnly }) {
   const { resolvedTheme } = useTheme();
+  const [data, setData] = useState();
 
-  const clean = useMemo(() => {
+  useEffect(() => {
     const sanitized = sanitizeInitialData(initialData);
     const appState = {
       ...sanitized.appState,
@@ -80,10 +77,10 @@ export default function ExcalidrawEditor({ initialData, onChange, readOnly, exca
       appState.viewModeEnabled = true;
     }
 
-    return {
+    setData({
       ...sanitized,
       appState,
-    };
+    })
   }, []);
 
   const handleChange = useCallback((elements, appState, files) => {
@@ -92,11 +89,9 @@ export default function ExcalidrawEditor({ initialData, onChange, readOnly, exca
     }
   }, [readOnly, onChange]);
 
-  const handleExcalidrawAPI = useCallback((api) => {
-    if (excalidrawRef) {
-      excalidrawRef.current = api;
-    }
-  }, [excalidrawRef]);
+  if (!data) {
+    return null;
+  }
 
   return (
     <div className="w-full h-full">
@@ -109,9 +104,8 @@ export default function ExcalidrawEditor({ initialData, onChange, readOnly, exca
         </div>
       }>
         <ExcalidrawLazy
-          initialData={clean}
+          initialData={data}
           onChange={handleChange}
-          excalidrawAPI={handleExcalidrawAPI}
           UIOptions={UIOptions}
           viewModeEnabled={readOnly}
         />