diff --git a/workflow/engine/src/ProcessMaker/Model/ProcessUser.php b/workflow/engine/src/ProcessMaker/Model/ProcessUser.php
index 5b741242b..59d79b927 100644
--- a/workflow/engine/src/ProcessMaker/Model/ProcessUser.php
+++ b/workflow/engine/src/ProcessMaker/Model/ProcessUser.php
@@ -38,11 +38,10 @@ class ProcessUser extends Model
      */
     public function scopeProcessGroupSupervisor($query, $userUid)
     {
-        $query->where('PU_TYPE', 'GROUP_SUPERVISOR');
-        $query->leftJoin('GROUP_USER', function ($leftJoin) use ($userUid) {
-            $leftJoin->on('PROCESS_USER.USR_UID', '=', 'GROUP_USER.GRP_UID')
-                ->where('GROUP_USER.USR_UID', $userUid);
-        });
+        // Ge the groups related to the user, Todo, implement the field PROCESS_USER.GRP_ID
+        $groups = GroupUser::getGroups($userUid, 'GRP_UID');
+        $query->where('PROCESS_USER.PU_TYPE', 'GROUP_SUPERVISOR');
+        $query->whereIn('PROCESS_USER.USR_UID', $groups);
         $query->joinProcess();
 
         return $query;