diff --git a/app/src/main/java/com/cappielloantonio/tempo/repository/GenreRepository.java b/app/src/main/java/com/cappielloantonio/tempo/repository/GenreRepository.java
index 35ca0e9e..58f00042 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/repository/GenreRepository.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/repository/GenreRepository.java
@@ -24,9 +24,14 @@ public class GenreRepository {
                 .enqueue(new Callback<ApiResponse>() {
                     @Override
                     public void onResponse(@NonNull Call<ApiResponse> call, @NonNull Response<ApiResponse> response) {
-                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse().getGenres() != null) {
+                        if (response.isSuccessful() && response.body() != null && response.body().getSubsonicResponse() != null && response.body().getSubsonicResponse().getGenres() != null) {
                             List<Genre> genreList = response.body().getSubsonicResponse().getGenres().getGenres();
 
+                            if (genreList == null || genreList.isEmpty()) {
+                                genres.setValue(Collections.emptyList());
+                                return;
+                            }
+
                             if (random) {
                                 Collections.shuffle(genreList);
                             }