diff --git a/apps/client/src/ee/confluence-import/components/confluence-import-modal.tsx b/apps/client/src/ee/confluence-import/components/confluence-import-modal.tsx
index ea2fa0048..1107cee49 100644
--- a/apps/client/src/ee/confluence-import/components/confluence-import-modal.tsx
+++ b/apps/client/src/ee/confluence-import/components/confluence-import-modal.tsx
@@ -134,7 +134,7 @@ export default function ConfluenceImportModal({ opened, onClose }: Props) {
   };
 
   const handleNextFromCredentials = async () => {
-    if (form.validate().hasErrors) return;
+    if ((await form.validate()).hasErrors) return;
     setLoading(true);
     setError(null);
     try {
diff --git a/apps/client/src/ee/confluence-import/types/confluence-import.types.ts b/apps/client/src/ee/confluence-import/types/confluence-import.types.ts
index fbd3dee40..0bf3d8361 100644
--- a/apps/client/src/ee/confluence-import/types/confluence-import.types.ts
+++ b/apps/client/src/ee/confluence-import/types/confluence-import.types.ts
@@ -53,7 +53,6 @@ export type ImportStatusResponse = {
   importedGroups?: number;
   totalRestrictedPages?: number;
   importedRestrictedPages?: number;
-  warnings?: string[];
   createdAt?: string;
   updatedAt?: string;
   error?: string;
@@ -81,7 +80,6 @@ export type ConfluenceImportHistoryItem = {
   importedRestrictedPages: number;
   cancelled: boolean;
   spaceKeys: string[];
-  warnings: string[];
   createdAt: string;
   updatedAt: string;
   creatorId: string | null;
diff --git a/apps/client/src/features/comment/components/comment-editor.tsx b/apps/client/src/features/comment/components/comment-editor.tsx
index aa305f134..d9ad96675 100644
--- a/apps/client/src/features/comment/components/comment-editor.tsx
+++ b/apps/client/src/features/comment/components/comment-editor.tsx
@@ -3,7 +3,18 @@ import { Placeholder } from "@tiptap/extension-placeholder";
 import { StarterKit } from "@tiptap/starter-kit";
 import { TextStyle } from "@tiptap/extension-text-style";
 import { Color } from "@tiptap/extension-color";
-import { Mention, LinkExtension } from "@docmost/editor-ext";
+import {
+  Mention,
+  LinkExtension,
+  CustomTable,
+  TableRow,
+  TableCell,
+  TableHeader,
+  TableView,
+  TiptapImage,
+  SharedStorage,
+} from "@docmost/editor-ext";
+import ImageView from "@/features/editor/components/image/image-view";
 import classes from "./comment.module.css";
 import { useFocusWithin } from "@mantine/hooks";
 import clsx from "clsx";
@@ -70,6 +81,18 @@ const CommentEditor = forwardRef(
             return ReactNodeViewRenderer(MentionView);
           },
         }),
+        SharedStorage,
+        CustomTable.configure({
+          resizable: false,
+          View: TableView,
+        }),
+        TableRow,
+        TableCell,
+        TableHeader,
+        TiptapImage.configure({
+          view: ImageView,
+          allowBase64: false,
+        }),
       ],
       editorProps: {
         attributes: {
diff --git a/apps/client/src/features/comment/components/comment.module.css b/apps/client/src/features/comment/components/comment.module.css
index dfa61b790..91f62fa32 100644
--- a/apps/client/src/features/comment/components/comment.module.css
+++ b/apps/client/src/features/comment/components/comment.module.css
@@ -53,6 +53,10 @@
         margin-block-end: 0;
     }
 
+    .ProseMirror :global(.tableWrapper) table {
+        min-width: 100% !important;
+    }
+
     .actions {
 
     }
diff --git a/apps/server/src/ee b/apps/server/src/ee
index 3a080841e..c6859dbf9 160000
--- a/apps/server/src/ee
+++ b/apps/server/src/ee
@@ -1 +1 @@
-Subproject commit 3a080841e4a79b99f122668325f88208d5ec8959
+Subproject commit c6859dbf9526cab91a4320d501c73c9526592406