diff --git a/public/site/plugins/comments/routes/delete.php b/public/site/plugins/comments/routes/delete.php
index b7b0895..f9dae6e 100644
--- a/public/site/plugins/comments/routes/delete.php
+++ b/public/site/plugins/comments/routes/delete.php
@@ -10,13 +10,13 @@ return [
       $page = page($data->location->page->uri);
       $project = page($data->location->project->uri);
       $file = $page->file($data->location->file->uuid);
-      $isReply = $data->location->parentId ?? false;
+      $isReply = $data->location->parent->id ?? false;
 
       $comments = $file->comments()->isEmpty() == true ? [] : Yaml::decode($file->comments()->value());
 
       foreach ($comments as $key => &$comment) {
         if ($isReply) {
-          if ($comment['id'] === $data->location->parentId) {
+          if ($comment['id'] === $data->location->parent->id) {
             foreach ($comment['replies'] as $replyKey => $reply) {
               if ($reply['id'] === $data->id) {
                 unset($comment['replies'][$replyKey]);
diff --git a/public/site/plugins/comments/routes/update.php b/public/site/plugins/comments/routes/update.php
index ca875d4..4622ff2 100644
--- a/public/site/plugins/comments/routes/update.php
+++ b/public/site/plugins/comments/routes/update.php
@@ -10,13 +10,13 @@ return [
     $page = page($data->location->page->uri);
     $project = page($data->location->project->uri);
     $file = $page->file($data->location->file->uuid);
-    $isReply = $data->location->parentId ?? false;
+    $isReply = $data->location->parent->id ?? false;
 
     $comments = $file->comments()->isEmpty() == true ? [] : Yaml::decode($file->comments()->value());
 
     foreach ($comments as $key => &$comment) {
       if ($isReply) {
-        if ($comment['id'] === $data->location->parentId) {
+        if ($comment['id'] === $data->location->parent->id) {
           foreach ($comment['replies'] as $replyKey => $reply) {
             if ($reply['id'] === $data->id) {
               $comment['replies'][$replyKey]["text"] = $data->text;
diff --git a/src/components/comments/Comment.vue b/src/components/comments/Comment.vue
index ddeb9a7..aa9257f 100644
--- a/src/components/comments/Comment.vue
+++ b/src/components/comments/Comment.vue
@@ -21,13 +21,13 @@
       </p>
     </header>
 
-    <p v-if="!isEditCommentMode" class="comment__body">
+    <p v-if="!comment.isEditMode" class="comment__body">
       {{ comment.text }}
     </p>
 
     <textarea v-else class="comment__body" v-model="draftText" :rows="Math.ceil(draftText.length / 32)"></textarea>
 
-    <footer v-if="!isEditCommentMode" class="comment__replies">
+    <footer v-if="!comment.isEditMode" class="comment__replies">
       <p v-if="comment.replies?.length > 0">
         {{ comment.replies.length }} réponse{{
           comment.replies.length > 1 ? "s" : ""
@@ -40,7 +40,7 @@
         <button
           class="btn btn--transparent btn--icon btn--sm"
           data-icon="edit"
-          @click="isEditCommentMode = true"
+          @click="comment.isEditMode = true"
         >
           <span class="sr-only">Éditer</span>
         </button>
@@ -89,7 +89,7 @@ const emits = defineEmits(["update:file", "close:comment"]);
 const userStore = useUserStore();
 const api = useApiStore();
 const dialog = useDialogStore();
-const { activeTracks, isEditCommentMode } = storeToRefs(useDialogStore());
+const { activeTracks } = storeToRefs(useDialogStore());
 const draftText = ref(comment.text);
 
 //  Functions
@@ -141,7 +141,7 @@ async function deleteComment(event) {
   // If there is an active track,
   // it's not the opened file that should be updated
   // but the corresponding file in the active track
-  if (activeTracks.value.length > 0) {
+  if (activeTracks.value?.length > 0) {
     activeTracks.value[0].files = activeTracks.value[0].files.map((file) => {
       if (file.uuid !== newFile.uuid) return file;
       return newFile;
@@ -159,12 +159,12 @@ function saveEditedComment(event) {
   comment.text = draftText.value;
   comment.date = dayjs().format();
   api.updateComment(comment);
-  isEditCommentMode.value = false;
+  comment.isEditMode = false;
 }
 
 function cancelEditComment(event) {
   event.stopImmediatePropagation();
-  isEditCommentMode.value = false;
+  comment.isEditMode = false;
   draftText.value = comment.text;
 }
 </script>
diff --git a/src/components/comments/Comments.vue b/src/components/comments/Comments.vue
index 8eb97e5..2f68b7d 100644
--- a/src/components/comments/Comments.vue
+++ b/src/components/comments/Comments.vue
@@ -121,8 +121,9 @@ dayjs.locale("fr");
 const { user } = useUserStore();
 const { page } = usePageStore();
 const dialog = useDialogStore();
-const { comments, openedFile, draftComment, activeTracks, isEditCommentMode } =
-  storeToRefs(useDialogStore());
+const { comments, openedFile, draftComment, activeTracks } = storeToRefs(
+  useDialogStore()
+);
 const api = useApiStore();
 
 const openedComment = ref(null);
@@ -304,11 +305,11 @@ function prepareDraftCommentInImage(event) {
 }
 
 function openComment(comment) {
-  if (isEditCommentMode.value) return;
+  if (comment.isEditMode) return;
 
   openedComment.value = comment;
 
-  if (activeTracks?.value.length === 1) {
+  if (activeTracks.value?.length === 1) {
     openedFile.value = activeTracks.value[0].files.find(
       (file) => file.uuid === openedComment.value.location.file.uuid
     );
diff --git a/src/stores/dialog.js b/src/stores/dialog.js
index 31ca70e..1b5abd9 100644
--- a/src/stores/dialog.js
+++ b/src/stores/dialog.js
@@ -6,7 +6,6 @@ export const useDialogStore = defineStore("dialog", () => {
   const content = ref(null);
   const openedFile = ref(null);
   const activeTracks = ref(null);
-  const isEditCommentMode = ref(false);
 
   const comments = computed(() => {
     if (activeTracks.value?.length > 0) {
@@ -144,6 +143,5 @@ export const useDialogStore = defineStore("dialog", () => {
     isCommentsOpen,
     isCommentPanelEnabled,
     updateFile,
-    isEditCommentMode,
   };
 });