diff --git a/workflow/engine/classes/Applications.php b/workflow/engine/classes/Applications.php
index 2cc198869..0d7b60e03 100644
--- a/workflow/engine/classes/Applications.php
+++ b/workflow/engine/classes/Applications.php
@@ -110,8 +110,10 @@ class Applications
                 $sqlData .= " AND APPLICATION.APP_STATUS = 'TO_DO'";
                 break;
             default: //All status
+                //When the status is TO_DO, we will get all the open threads
                 $sqlData .= " AND (APP_DELEGATION.DEL_THREAD_STATUS = 'OPEN' ";
-                $sqlData .= " OR (APP_DELEGATION.DEL_THREAD_STATUS = 'CLOSED' AND APP_DELEGATION.DEL_LAST_INDEX = 1)) ";
+                //When the status is COMPLETED, we will get the last task that with completed the case
+                $sqlData .= " OR (APP_DELEGATION.DEL_THREAD_STATUS = 'CLOSED' AND APP_DELEGATION.DEL_LAST_INDEX = 1 AND APPLICATION.APP_STATUS_ID = 3)) ";
                 break;
         }