diff --git a/src/Controller/CapsuleController.php b/src/Controller/CapsuleController.php
index 74e435537483445d9890925502a20b735c5561a8..962a96247e9d04dd9cecf67c2d5424a11c9a5597 100644
--- a/src/Controller/CapsuleController.php
+++ b/src/Controller/CapsuleController.php
@@ -38,7 +38,7 @@ class CapsuleController extends AbstractController
             return $this->redirectToRoute('app_logout');
         }
 
-        $all_capsules = $capsule_repository->findBy(['creation_author' => $current_user]);
+        $all_capsules = $current_user->getCapsules();
 
         $capsules = $paginator->paginate(
             $all_capsules,
@@ -48,6 +48,7 @@ class CapsuleController extends AbstractController
 
         return $this->render('capsule/index.html.twig', [
             'capsules' => $capsules,
+            'current_user' => $current_user,
             'legacy_url' => $this->getParameter('app.legacy_external_prefix')
         ]);
     }
diff --git a/templates/capsule/index.html.twig b/templates/capsule/index.html.twig
index 6bc351eba424fd3447bc61d1870c48faaeb5adad..fe8a685f763d9bba259d71a460a00d485ae59f41 100644
--- a/templates/capsule/index.html.twig
+++ b/templates/capsule/index.html.twig
@@ -75,12 +75,16 @@
                             {{ 'capsule.duplicate.link'|trans }}
                         </a>
                     </div>
+
+                    {% if capsule.getCreationauthor() is same as current_user %}
                     <div class="list-item text-nowrap">
                         <a href="/capsule/delete/{{ capsule.getId() }}" class="links text-decoration-none">
                             <i class="fas fa-trash m-2"></i>
                             {{ 'capsule.delete.link'|trans }}
                         </a>
                     </div>
+                    {% endif %}
+
                     <a href="capsule/edit/{{ capsule.getLinkPath() }}" class="list-item text-nowrap lh-md">
                         <button class="standard-button p-2">
                             {{ 'capsule.edit.link'|trans }}