diff --git a/apps/cms/src/app/(protected)/content/article/[documentId]/page.tsx b/apps/cms/src/app/(protected)/content/article/[documentId]/page.tsx
index a584ba97..f04f2048 100644
--- a/apps/cms/src/app/(protected)/content/article/[documentId]/page.tsx
+++ b/apps/cms/src/app/(protected)/content/article/[documentId]/page.tsx
@@ -28,18 +28,9 @@ export default function DocumentDetailsPage() {
 
   useEffect(() => {
     if (updateTitleShown) return;
-    async function onDocumentTitleChange(title: string) {
-      console.log("[onDocumentTitleChange]", title);
-      if (!document) {
-        return;
-      }
-
-      document.data.title = title;
-      await update(document);
-    }
 
     onDocumentTitleChange(title);
-  }, [document, title, update, updateTitleShown]);
+  }, [updateTitleShown]);
 
   useEffect(() => {
     if (document) {
@@ -49,6 +40,16 @@ export default function DocumentDetailsPage() {
     return () => setTitle("");
   }, [document]);
 
+  async function onDocumentTitleChange(title: string) {
+    console.log("[onDocumentTitleChange]", title);
+    if (!document) {
+      return;
+    }
+
+    document.data.title = title;
+    await update(document);
+  }
+
   async function onDocumentContentChange(content: string) {
     console.log("[onDocumentContentChange]", content);
     if (!document) {
diff --git a/libs/domain-frontend/src/models/TanamDocument.ts b/libs/domain-frontend/src/models/TanamDocument.ts
index 9d77a810..719401af 100644
--- a/libs/domain-frontend/src/models/TanamDocument.ts
+++ b/libs/domain-frontend/src/models/TanamDocument.ts
@@ -20,8 +20,8 @@ export class TanamDocument extends TanamDocumentBase<Timestamp, FieldValue> {
       snap.id,
       data.createdAt,
       data.updatedAt,
-      data.data,
       data.documentType,
+      data.data,
       data.revision,
       data.publishedAt,
     );