diff --git a/ScalliGraph b/ScalliGraph
index a612bcd28d..c889571c81 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit a612bcd28dffd617d29ecfd5d0511e3d5ed3666d
+Subproject commit c889571c8184ecb3966c8edc5b33e046c824b98b
diff --git a/frontend/app/scripts/controllers/MainPageCtrl.js b/frontend/app/scripts/controllers/MainPageCtrl.js
index 4c765e55a3..a468799838 100644
--- a/frontend/app/scripts/controllers/MainPageCtrl.js
+++ b/frontend/app/scripts/controllers/MainPageCtrl.js
@@ -19,7 +19,7 @@
                     {_name: 'currentUser'},
                     {_name: 'tasks'}
                 ] : [
-                    {_name: 'waitingTask'}
+                    {_name: 'waitingTasks'}
                 ];
 
                 if ($stateParams.viewId === 'mytasks') {
diff --git a/frontend/app/scripts/controllers/RootCtrl.js b/frontend/app/scripts/controllers/RootCtrl.js
index 15341e81f2..90eaf3f55c 100644
--- a/frontend/app/scripts/controllers/RootCtrl.js
+++ b/frontend/app/scripts/controllers/RootCtrl.js
@@ -79,7 +79,7 @@ angular.module('theHiveControllers').controller('RootCtrl',
         });
 
         StreamQuerySrv('v1', [
-            {_name: 'waitingTask'},
+            {_name: 'waitingTasks'},
             {_name: 'count'}
         ], {
             scope: $scope,
diff --git a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
index e8dca8455b..5436bee303 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/TaskCtrl.scala
@@ -125,8 +125,22 @@ class PublicTask @Inject() (taskSrv: TaskSrv, organisationSrv: OrganisationSrv,
     Query.output[(RichTask, Option[RichCase])],
     Query[Traversal.V[Task], Traversal.V[User]]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext)),
     Query.init[Traversal.V[Task]](
+      "waitingTasks",
+      (graph, authContext) =>
+        taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).inOrganisation(organisationSrv.currentId(graph, authContext))
+    ),
+    Query.init[Traversal.V[Task]]( // DEPRECATED
       "waitingTask",
-      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(authContext)
+      (graph, authContext) =>
+        taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).inOrganisation(organisationSrv.currentId(graph, authContext))
+    ),
+    Query.init[Traversal.V[Task]](
+      "myTasks",
+      (graph, authContext) =>
+        taskSrv
+          .startTraversal(graph)
+          .assignTo(authContext.userId)
+          .inOrganisation(organisationSrv.currentId(graph, authContext))
     ),
     Query[Traversal.V[Task], Traversal.V[Log]]("logs", (taskSteps, _) => taskSteps.logs),
     Query[Traversal.V[Task], Traversal.V[Case]]("case", (taskSteps, _) => taskSteps.`case`),
diff --git a/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
index 9b24ae4d9f..4978b1d459 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/TaskCtrl.scala
@@ -52,8 +52,20 @@ class TaskCtrl @Inject() (
     Query.outputWithContext[RichTask, Traversal.V[Task]]((taskSteps, _) => taskSteps.richTask)
   override val extraQueries: Seq[ParamQuery[_]] = Seq(
     Query.init[Traversal.V[Task]](
+      "waitingTasks",
+      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(organisationSrv)(authContext)
+    ),
+    Query.init[Traversal.V[Task]]( // DEPRECATED
       "waitingTask",
-      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(authContext)
+      (graph, authContext) => taskSrv.startTraversal(graph).has(_.status, TaskStatus.Waiting).visible(organisationSrv)(authContext)
+    ),
+    Query.init[Traversal.V[Task]](
+      "myTasks",
+      (graph, authContext) =>
+        taskSrv
+          .startTraversal(graph)
+          .assignTo(authContext.userId)
+          .visible(organisationSrv)(authContext)
     ),
     Query[Traversal.V[Task], Traversal.V[User]]("assignableUsers", (taskSteps, authContext) => taskSteps.assignableUsers(authContext)),
     Query[Traversal.V[Task], Traversal.V[Log]]("logs", (taskSteps, _) => taskSteps.logs),