diff --git a/partitioncloud/templates/albums/album.html b/partitioncloud/templates/albums/album.html
index cd52624..f5db1e4 100644
--- a/partitioncloud/templates/albums/album.html
+++ b/partitioncloud/templates/albums/album.html
@@ -53,7 +53,7 @@
           {% endif %}
           {% if not_participant %}
           <a href="/albums/{{ album.uuid }}/join">{{ _("Join") }}</a>
-          {% elif album.users | length > 1 %}
+          {% elif g.user and not not_participant %}
           <a href="/albums/{{ album.uuid }}/quit">{{ _("Quit") }}</a>
           {% endif %}
           <a href="#share">{{ _("Share") }}</a>
diff --git a/partitioncloud/templates/groupe/index.html b/partitioncloud/templates/groupe/index.html
index e4867c8..108bf5b 100644
--- a/partitioncloud/templates/groupe/index.html
+++ b/partitioncloud/templates/groupe/index.html
@@ -45,7 +45,7 @@
       <div class="dropdown-content dp1">
       {% if not_participant %}
         <a href="/groupe/{{ groupe.uuid }}/join">{{ _("Join") }}</a>
-      {% elif groupe.users | length > 1 and g.user %}
+      {% elif g.user and not not_participant %}
         <a href="/groupe/{{ groupe.uuid }}/quit">{{ _("Quit") }}</a>
       {% endif %}
       <a href="#share">{{ _("Share") }}</a>