diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index bce67de89a..0a49d29468 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -193,7 +193,7 @@ $('#confirmButton').click(function()
         alert(teamMemberError);
         return false;
     }
-    if(totalLeft == 0)
+    if(totalLeft == 0 && (taskStatus == 'doing' || taskStatus == 'pause'))
     {
         alert(totalLeftError);
         return false;
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 964ef08841..7ccf449406 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -18,6 +18,7 @@
 <?php js::set('oldAssignedTo', $task->assignedTo);?>
 <?php js::set('oldExecutionID', $task->execution);?>
 <?php js::set('oldConsumed', $task->consumed);?>
+<?php js::set('taskStatus', $task->status);?>
 <?php js::set('confirmChangeExecution', $lang->task->confirmChangeExecution);?>
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>