diff --git a/apps/client/src/features/editor/components/drawio/drawio-view.tsx b/apps/client/src/features/editor/components/drawio/drawio-view.tsx
index 6f7d68cc..16e6dc97 100644
--- a/apps/client/src/features/editor/components/drawio/drawio-view.tsx
+++ b/apps/client/src/features/editor/components/drawio/drawio-view.tsx
@@ -77,7 +77,7 @@ export default function DrawioView(props: NodeViewProps) {
     }
 
     updateAttributes({
-      src: `/files/${attachment.id}/${attachment.fileName}?t=${new Date(attachment.updatedAt).getTime()}`,
+      src: `/api/files/${attachment.id}/${attachment.fileName}?t=${new Date(attachment.updatedAt).getTime()}`,
       title: attachment.fileName,
       size: attachment.fileSize,
       attachmentId: attachment.id,
diff --git a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
index e145918e..bbca39ba 100644
--- a/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
+++ b/apps/client/src/features/editor/components/excalidraw/excalidraw-view.tsx
@@ -101,7 +101,7 @@ export default function ExcalidrawView(props: NodeViewProps) {
     }
 
     updateAttributes({
-      src: `/files/${attachment.id}/${attachment.fileName}?t=${new Date(attachment.updatedAt).getTime()}`,
+      src: `/api/files/${attachment.id}/${attachment.fileName}?t=${new Date(attachment.updatedAt).getTime()}`,
       title: attachment.fileName,
       size: attachment.fileSize,
       attachmentId: attachment.id,
diff --git a/apps/client/src/lib/config.ts b/apps/client/src/lib/config.ts
index 4c3d3545..9e1efc30 100644
--- a/apps/client/src/lib/config.ts
+++ b/apps/client/src/lib/config.ts
@@ -53,7 +53,16 @@ export function getSpaceUrl(spaceSlug: string) {
 }
 
 export function getFileUrl(src: string) {
-  return src?.startsWith("/files/") ? getBackendUrl() + src : src;
+  if (!src) return src;
+  if (src.startsWith("http")) return src;
+  if (src.startsWith("/api/")) {
+    // Remove the '/api' prefix
+    return getBackendUrl() + src.substring(4);
+  }
+  if (src.startsWith("/files/")) {
+    return getBackendUrl() + src;
+  }
+  return src;
 }
 
 export function getFileUploadSizeLimit() {
diff --git a/packages/editor-ext/src/lib/attachment/attachment-upload.ts b/packages/editor-ext/src/lib/attachment/attachment-upload.ts
index b1f10858..ed44b842 100644
--- a/packages/editor-ext/src/lib/attachment/attachment-upload.ts
+++ b/packages/editor-ext/src/lib/attachment/attachment-upload.ts
@@ -95,7 +95,7 @@ export const handleAttachmentUpload =
         if (!attachment) return;
 
         const node = schema.nodes.attachment?.create({
-          url: `/files/${attachment.id}/${attachment.fileName}`,
+          url: `/api/files/${attachment.id}/${attachment.fileName}`,
           name: attachment.fileName,
           mime: attachment.mimeType,
           size: attachment.fileSize,
diff --git a/packages/editor-ext/src/lib/image/image-upload.ts b/packages/editor-ext/src/lib/image/image-upload.ts
index 8ffa2cbd..2f8b824e 100644
--- a/packages/editor-ext/src/lib/image/image-upload.ts
+++ b/packages/editor-ext/src/lib/image/image-upload.ts
@@ -102,7 +102,7 @@ export const handleImageUpload =
         if (!attachment) return;
 
         const node = schema.nodes.image?.create({
-          src: `/files/${attachment.id}/${attachment.fileName}`,
+          src: `/api/files/${attachment.id}/${attachment.fileName}`,
           attachmentId: attachment.id,
           title: attachment.fileName,
           size: attachment.fileSize,
diff --git a/packages/editor-ext/src/lib/video/video-upload.ts b/packages/editor-ext/src/lib/video/video-upload.ts
index 022e6306..b0a9a25a 100644
--- a/packages/editor-ext/src/lib/video/video-upload.ts
+++ b/packages/editor-ext/src/lib/video/video-upload.ts
@@ -102,7 +102,7 @@ export const handleVideoUpload =
         if (!attachment) return;
 
         const node = schema.nodes.video?.create({
-          src: `/files/${attachment.id}/${attachment.fileName}`,
+          src: `/api/files/${attachment.id}/${attachment.fileName}`,
           attachmentId: attachment.id,
           title: attachment.fileName,
           size: attachment.fileSize,