diff --git a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
index 098f320d34..c71af8ca49 100644
--- a/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v0/ObservableCtrl.scala
@@ -367,7 +367,7 @@ class PublicObservable @Inject() (
   override val initialQuery: Query =
     Query.init[Traversal.V[Observable]](
       "listObservable",
-      (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.observables
+      (graph, authContext) => observableSrv.startTraversal(graph).visible(organisationSrv)(authContext)
     )
   override val getQuery: ParamQuery[EntityIdOrName] = Query.initWithParam[EntityIdOrName, Traversal.V[Observable]](
     "getObservable",
diff --git a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
index ede9f538ec..4118aea90e 100644
--- a/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
+++ b/thehive/app/org/thp/thehive/controllers/v1/ObservableCtrl.scala
@@ -56,7 +56,7 @@ class ObservableCtrl @Inject() (
   override val initialQuery: Query =
     Query.init[Traversal.V[Observable]](
       "listObservable",
-      (graph, authContext) => organisationSrv.get(authContext.organisation)(graph).shares.observables
+      (graph, authContext) => observableSrv.startTraversal(graph).visible(organisationSrv)(authContext)
     )
   override val getQuery: ParamQuery[EntityIdOrName] = Query.initWithParam[EntityIdOrName, Traversal.V[Observable]](
     "getObservable",