diff --git a/src/Domain/Registry/Controller/ConformiteTraitementController.php b/src/Domain/Registry/Controller/ConformiteTraitementController.php
index bf0cbcfe8ef9bd96880022b54896310aecb834f1..52f99d63a39f4239072b7f32d9a14a6bba689b9e 100644
--- a/src/Domain/Registry/Controller/ConformiteTraitementController.php
+++ b/src/Domain/Registry/Controller/ConformiteTraitementController.php
@@ -156,8 +156,9 @@ class ConformiteTraitementController extends CRUDController
     public function reportAction()
     {
         $collectivity = $this->userProvider->getAuthenticatedUser()->getCollectivity();
+
         if (!$collectivity->isHasModuleConformiteTraitement()) {
-            $this->redirectToRoute('registry_conformite_organisation_list');
+            return $this->redirectToRoute('registry_conformite_organisation_list');
         }
         $objects = $this->treatmentRepository->findAllByCollectivity(
             $collectivity
diff --git a/src/Domain/Registry/Controller/MesurementController.php b/src/Domain/Registry/Controller/MesurementController.php
index 918b2dd0ce71185dfb178d292bd214f24a8c76bc..fe662fb45815af94206adbc321000d76639b287b 100644
--- a/src/Domain/Registry/Controller/MesurementController.php
+++ b/src/Domain/Registry/Controller/MesurementController.php
@@ -488,15 +488,7 @@ class MesurementController extends CRUDController
     private function generateActionCell(Model\Mesurement $mesurement, bool $isActionPlan = false)
     {
         $user = $this->userProvider->getAuthenticatedUser();
-        if (
-            (
-                $this->authorizationChecker->isGranted('ROLE_USER')
-                && $mesurement->getCollectivity()->getIsServicesEnabled()
-                && ($user->getServices()->isEmpty() || $mesurement->isInUserServices($user))
-            )
-            || $this->authorizationChecker->isGranted('ROLE_ADMIN')
-            || !$mesurement->getCollectivity()->getIsServicesEnabled()
-        ) {
+        if ($user->hasAccessTo($mesurement)) {
             if ($isActionPlan) {
                 return '<a href="' .
                     $this->router->generate('registry_mesurement_edit', ['id' => $mesurement->getId()]) . '">