diff --git a/Riot/Modules/MediaPicker/MediaPickerViewController.m b/Riot/Modules/MediaPicker/MediaPickerViewController.m
index b2e2ddc616..e4da94a8d1 100644
--- a/Riot/Modules/MediaPicker/MediaPickerViewController.m
+++ b/Riot/Modules/MediaPicker/MediaPickerViewController.m
@@ -951,8 +951,9 @@ - (UITableViewCell*)tableView:(UITableView *)tableView cellForRowAtIndexPath:(no
         PHFetchResult *assets = [PHAsset fetchAssetsInAssetCollection:collection options:options];
         cell.albumCountLabel.text = [NSString stringWithFormat:@"%tu", assets.count];
         
-        // Report first asset thumbnail (except for 'Recently Deleted' album)
-        if (assets.count && collection.assetCollectionSubtype != 1000000201)
+        // Report first asset thumbnail (except for 'Recently Deleted' and 'Hidden' albums)
+        BOOL isSensitiveCollection = collection.assetCollectionSubtype == 1000000201 || collection.assetCollectionSubtype == PHAssetCollectionSubtypeSmartAlbumAllHidden;
+        if (assets.count && !isSensitiveCollection)
         {
             PHAsset *asset = assets[0];
             
diff --git a/changelog.d/6096.bugfix b/changelog.d/6096.bugfix
new file mode 100644
index 0000000000..37ac793b24
--- /dev/null
+++ b/changelog.d/6096.bugfix
@@ -0,0 +1 @@
+Media gallery: Don't show a thumbnail for the hidden album.