diff --git a/storage_s3/indico_storage_s3/controllers.py b/storage_s3/indico_storage_s3/controllers.py
index 5995b79..eaea835 100644
--- a/storage_s3/indico_storage_s3/controllers.py
+++ b/storage_s3/indico_storage_s3/controllers.py
@@ -52,7 +52,7 @@ class RHBuckets(RH):
     def _get_dynamic_info(self, backend_name, storage):
         buckets = set()
         for model in StoredFileMixin.__subclasses__():
-            query = (db.session.query(db.func.split_part(model.storage_file_id, '//', 1))
+            query = (db.session.query(db.func.split_part(model.storage_file_id, '//', 1).distinct())
                      .filter(model.storage_file_id.isnot(None), model.storage_backend == backend_name))
             buckets.update(bucket for bucket, in query)
 
diff --git a/storage_s3/setup.py b/storage_s3/setup.py
index 3f6b507..6db2b2c 100644
--- a/storage_s3/setup.py
+++ b/storage_s3/setup.py
@@ -21,7 +21,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='indico-plugin-storage-s3',
-    version='2.0',
+    version='2.0.1',
     description='S3 storage backend for Indico',
     url='https://github.com/indico/indico-plugins',
     license='https://www.gnu.org/licenses/gpl-3.0.txt',