diff --git a/app/src/main/java/com/kabouzeid/gramophone/loader/GenreLoader.java b/app/src/main/java/com/kabouzeid/gramophone/loader/GenreLoader.java
index 19a7d0ae..154e6c8a 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/loader/GenreLoader.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/loader/GenreLoader.java
@@ -30,7 +30,17 @@ public class GenreLoader {
         if (cursor != null) {
             if (cursor.moveToFirst()) {
                 do {
-                    genres.add(getGenreFromCursor(context, cursor));
+                    Genre genre = getGenreFromCursor(context, cursor);
+                    if (genre.songCount > 0) {
+                        genres.add(genre);
+                    } else {
+                        // try to remove the empty genre from the media store
+                        try {
+                            context.getContentResolver().delete(Genres.EXTERNAL_CONTENT_URI, Genres._ID + " == " + genre.id, null);
+                        } catch (IllegalArgumentException | UnsupportedOperationException ignored) {
+                            // nothing we can do then
+                        }
+                    }
                 } while (cursor.moveToNext());
             }
             cursor.close();
@@ -64,15 +74,10 @@ public class GenreLoader {
                 Genres.NAME
         };
 
-        // Genres that actually have songs
-        final String selection = Genres._ID + " IN" +
-                " (SELECT " + Genres.Members.GENRE_ID + " FROM audio_genres_map WHERE " + Genres.Members.AUDIO_ID + " IN" +
-                " (SELECT " + Genres._ID + " FROM audio_meta WHERE " + SongLoader.BASE_SELECTION + "))";
-
         try {
             return context.getContentResolver().query(
                     Genres.EXTERNAL_CONTENT_URI,
-                    projection, selection, null, PreferenceUtil.getInstance(context).getGenreSortOrder());
+                    projection, null, null, PreferenceUtil.getInstance(context).getGenreSortOrder());
         } catch (SecurityException e) {
             return null;
         }