diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php
index 2782da3e9e..c51fb07695 100755
--- a/ProcessMaker/Http/Controllers/TaskController.php
+++ b/ProcessMaker/Http/Controllers/TaskController.php
@@ -92,7 +92,7 @@ public function edit(ProcessRequestToken $task, string $preview = '')
         $task->allow_interstitial = $interstitial['allow_interstitial'];
         $task->definition = $task->getDefinition();
         $task->requestor = $task->processRequest->user;
-        $task->draft = $task->draft();
+        $task->draft = $task->draft;
         $element = $task->getDefinition(true);
         $screenFields = $screenVersion ? $screenVersion->screenFilteredFields() : [];
         $taskDraftsEnabled = TaskDraft::draftsEnabled();
diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php
index 74b8187072..53941a8029 100644
--- a/resources/views/tasks/edit.blade.php
+++ b/resources/views/tasks/edit.blade.php
@@ -146,7 +146,10 @@ class="btn d-block mr-0 ml-auto button-collapse"
                         <div class="card collapse-content">
                           <ul class="list-group list-group-flush w-100">
                             <li class="list-group-item">
-                            <div class="row justify-content-start pb-1">
+                            <div
+                              v-if="taskDraftsEnabled"
+                              class="row justify-content-start pb-1"
+                            >
                               <task-save-notification
                                 :options="options"
                                 :task="task"
@@ -395,6 +398,7 @@ class="multiselect__tag-icon"></i>
     );
 
     const task = @json($task);
+    let draftTask = task.draft;
     const userHasAccessToTask = {{ Auth::user()->can('update', $task) ? "true": "false" }};
     const userIsAdmin = {{ Auth::user()->is_administrator ? "true": "false" }};
     const userIsProcessManager = {{ Auth::user()->id === $task->process?->manager_id ? "true": "false" }};
@@ -428,6 +432,7 @@ class="multiselect__tag-icon"></i>
           filter: "",
           showReassignment: false,
           task,
+          draftTask,
           userHasAccessToTask,
           selectedUser: [],
           hasErrors: false,
@@ -461,8 +466,8 @@ class="multiselect__tag-icon"></i>
                 history.replaceState(null, null, `/tasks/${task.id}/edit`);
               }
               if (task.draft) {
-                this.lastAutosave = moment(task.draft.updated_at).format("DD MMMM YYYY | HH:mm");
-                this.lastAutosaveNav = moment(task.draft.updated_at).format("MMM DD, YYYY / HH:mm");
+                this.lastAutosave = moment(this.draftTask.updated_at).format("DD MMMM YYYY | HH:mm");
+                this.lastAutosaveNav = moment(this.draftTask.updated_at).format("MMM DD, YYYY / HH:mm");
               } else {
                 this.lastAutosave = "-";
                 this.lastAutosaveNav = "-"
@@ -720,6 +725,7 @@ class="multiselect__tag-icon"></i>
                   this.task.draft,
                   response.data
                 );
+                this.draftTask = structuredClone(response.data);
               })
               .catch(() => {
                 this.errorAutosave = true;