diff --git a/apps/web/partials/editor/editor.tsx b/apps/web/partials/editor/editor.tsx
index cf53ff338..f75235b5a 100644
--- a/apps/web/partials/editor/editor.tsx
+++ b/apps/web/partials/editor/editor.tsx
@@ -44,6 +44,7 @@ export const Editor = React.memo(function Editor({
     editorProps: {
       transformPastedHTML: html => removeIdAttributes(html),
     },
+    immediatelyRender: false,
   });
 
   useInterceptEditorLinks(spaceId);
diff --git a/apps/web/partials/editor/server-content.tsx b/apps/web/partials/editor/server-content.tsx
index 5cd8ddf4c..025f57296 100644
--- a/apps/web/partials/editor/server-content.tsx
+++ b/apps/web/partials/editor/server-content.tsx
@@ -10,7 +10,10 @@ type ServerContentProps = {
 };
 
 export const ServerContent = ({ content }: ServerContentProps) => {
-  if (!content) return null;
+  if (!content) {
+    console.error('Content is undefined');
+    return null;
+  }
 
   return (
     <div className="tiptap ProseMirror !pb-[2rem]">
@@ -27,9 +30,9 @@ type BlockProps = {
 };
 
 const Block = ({ block }: BlockProps) => {
-  if (!block.content) {
-    return null;
-  }
+  // if (!block.content) {
+  //   return null;
+  // }
 
   switch (block.type) {
     case 'paragraph': {