diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
index 87c75f2ade..8d9303fc1b 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
@@ -88,6 +88,7 @@ class MediaRepository {
                                                                                                  folder.getCount(),
                                                                                                  folder.getBucketId(),
                                                                                                  MediaFolder.FolderType.NORMAL))
+                                                                  .filter(folder -> folder.getTitle() != null)
                                                                   .sorted((o1, o2) -> o1.getTitle().toLowerCase().compareTo(o2.getTitle().toLowerCase()))
                                                                   .toList();