diff --git a/ScalliGraph b/ScalliGraph
index 7491bd43bb..5b48cd7508 160000
--- a/ScalliGraph
+++ b/ScalliGraph
@@ -1 +1 @@
-Subproject commit 7491bd43bb5f6b72079f79aafb1c1fa15e83f7b1
+Subproject commit 5b48cd75080a17ba0986ddcc7c572a96de86ddaa
diff --git a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
index 3402cd5798..309afaaf5f 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/DashboardCtrl.scala
@@ -110,28 +110,29 @@ class PublicDashboard @Inject() (
     .property("description", UMapping.string)(_.field.updatable)
     .property("definition", UMapping.string)(_.field.updatable)
     .property("status", UMapping.string)(
-      _.select(_.organisation.fold.domainMap(d => if (d.isEmpty) "Private" else "Shared")).custom { // TODO replace by choose step
-        case (_, "Shared", vertex, _, graph, authContext) =>
-          for {
-            dashboard <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
-            _         <- dashboardSrv.share(dashboard, authContext.organisation, writable = false)(graph, authContext)
-          } yield Json.obj("status" -> "Shared")
+      _.select(_.choose(_.organisation, "Shared", "Private"))
+        .custom {
+          case (_, "Shared", vertex, _, graph, authContext) =>
+            for {
+              dashboard <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
+              _         <- dashboardSrv.share(dashboard, authContext.organisation, writable = false)(graph, authContext)
+            } yield Json.obj("status" -> "Shared")
 
-        case (_, "Private", vertex, _, graph, authContext) =>
-          for {
-            d <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
-            _ <- dashboardSrv.unshare(d, authContext.organisation)(graph, authContext)
-          } yield Json.obj("status" -> "Private")
+          case (_, "Private", vertex, _, graph, authContext) =>
+            for {
+              d <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
+              _ <- dashboardSrv.unshare(d, authContext.organisation)(graph, authContext)
+            } yield Json.obj("status" -> "Private")
 
-        case (_, "Deleted", vertex, _, graph, authContext) =>
-          for {
-            d <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
-            _ <- dashboardSrv.remove(d)(graph, authContext)
-          } yield Json.obj("status" -> "Deleted")
+          case (_, "Deleted", vertex, _, graph, authContext) =>
+            for {
+              d <- dashboardSrv.get(vertex)(graph).filter(_.user.current(authContext)).getOrFail("Dashboard")
+              _ <- dashboardSrv.remove(d)(graph, authContext)
+            } yield Json.obj("status" -> "Deleted")
 
-        case (_, status, _, _, _, _) =>
-          Failure(InvalidFormatAttributeError("status", "String", Set("Shared", "Private", "Deleted"), FString(status)))
-      }
+          case (_, status, _, _, _, _) =>
+            Failure(InvalidFormatAttributeError("status", "String", Set("Shared", "Private", "Deleted"), FString(status)))
+        }
     )
     .build
 }
diff --git a/thehive/app/org/thp/thehive/services/DashboardSrv.scala b/thehive/app/org/thp/thehive/services/DashboardSrv.scala
index c799d8c106..ddedda2344 100644
--- a/thehive/app/org/thp/thehive/services/DashboardSrv.scala
+++ b/thehive/app/org/thp/thehive/services/DashboardSrv.scala
@@ -103,10 +103,10 @@ object DashboardOps {
 
     def organisationShares: Traversal[Seq[(String, Boolean)], JList[JMap[String, Any]], Converter[Seq[(String, Boolean)], JList[JMap[String, Any]]]] =
       traversal
-        .outE[OrganisationDashboard]
+        .inE[OrganisationDashboard]
         .project(
           _.byValue(_.writable)
-            .by(_.inV)
+            .by(_.outV)
         )
         .fold
         .domainMap(_.map { case (writable, orgs) => (orgs.value[String]("name"), writable) })