diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 9f8df5ceb..ac0f5203b 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1674,6 +1674,7 @@ export default {
                 url: 'project/task/remove',
                 data,
             }).then(result => {
+                state.taskArchiveView = 0;
                 dispatch("forgetTask", data.task_id)
                 resolve(result)
             }).catch(e => {
@@ -1830,10 +1831,8 @@ export default {
             } else {
                 task_id = task.id;
             }
-            state.taskArchiveView = task.deleted_at === null && task.archived_at !== null ? task_id : 0;
-        } else {
-            state.taskArchiveView = 0;
         }
+        state.taskArchiveView = task_id;
         state.taskId = task_id;
         if (task_id > 0) {
             dispatch("getTaskOne", {