diff --git a/core/templates/core/user_pictures.jinja b/core/templates/core/user_pictures.jinja
index 2ed7b482..471aecda 100644
--- a/core/templates/core/user_pictures.jinja
+++ b/core/templates/core/user_pictures.jinja
@@ -13,7 +13,7 @@
     {% if can_edit(profile, user) %}
         <button id="download_all_pictures", onclick=download_pictures()>{% trans %}Download all my pictures{% endtrans %}</button>
     {% endif %}
-    {% for a in albums | unique %}
+    {% for a in albums %}
         <h4>{{ a.name }}</h4>
         <div class="photos">
             {% for p in pictures[a.id] %}
diff --git a/core/views/user.py b/core/views/user.py
index f205a9d6..dbd60f13 100644
--- a/core/views/user.py
+++ b/core/views/user.py
@@ -321,7 +321,7 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
         last_album = None
         for picture in picture_qs:
             album = picture.parent
-            if album.id != last_album:
+            if album.id != last_album and album not in kwargs["albums"]:
                 kwargs["albums"].append(album)
                 kwargs["pictures"][album.id] = []
                 last_album = album.id