diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
index 1c3f2e77..77c3169a 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/ArtistCatalogueAdapter.java
@@ -50,7 +50,7 @@ public class ArtistCatalogueAdapter extends RecyclerView.Adapter<ArtistCatalogue
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
             artists.clear();
-            artists.addAll((List) results.values);
+            if (results.count > 0) artists.addAll((List) results.values);
             notifyDataSetChanged();
         }
     };
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java
index 80ee3b2b..835b32b9 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/GenreCatalogueAdapter.java
@@ -13,7 +13,6 @@ import com.cappielloantonio.tempo.databinding.ItemLibraryCatalogueGenreBinding;
 import com.cappielloantonio.tempo.interfaces.ClickCallback;
 import com.cappielloantonio.tempo.subsonic.models.Genre;
 import com.cappielloantonio.tempo.util.Constants;
-import com.cappielloantonio.tempo.util.MusicUtil;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -49,7 +48,7 @@ public class GenreCatalogueAdapter extends RecyclerView.Adapter<GenreCatalogueAd
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
             genres.clear();
-            genres.addAll((List) results.values);
+            if (results.count > 0) genres.addAll((List) results.values);
             notifyDataSetChanged();
         }
     };
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlaylistHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlaylistHorizontalAdapter.java
index 53e58b1f..baa4005e 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlaylistHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PlaylistHorizontalAdapter.java
@@ -54,7 +54,7 @@ public class PlaylistHorizontalAdapter extends RecyclerView.Adapter<PlaylistHori
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
             playlists.clear();
-            playlists.addAll((List) results.values);
+            if (results.count > 0) playlists.addAll((List) results.values);
             notifyDataSetChanged();
         }
     };
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PodcastChannelCatalogueAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PodcastChannelCatalogueAdapter.java
index 91b300fc..3eb6bc02 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PodcastChannelCatalogueAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/PodcastChannelCatalogueAdapter.java
@@ -48,7 +48,7 @@ public class PodcastChannelCatalogueAdapter extends RecyclerView.Adapter<Podcast
         @Override
         protected void publishResults(CharSequence constraint, FilterResults results) {
             podcastChannels.clear();
-            podcastChannels.addAll((List) results.values);
+            if (results.count > 0) podcastChannels.addAll((List) results.values);
             notifyDataSetChanged();
         }
     };
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/GenreCatalogueFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/GenreCatalogueFragment.java
index f6244573..0580a9a0 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/GenreCatalogueFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/GenreCatalogueFragment.java
@@ -105,7 +105,7 @@ public class GenreCatalogueFragment extends Fragment implements ClickCallback {
         genreCatalogueAdapter.setStateRestorationPolicy(RecyclerView.Adapter.StateRestorationPolicy.PREVENT_WHEN_EMPTY);
         bind.genreCatalogueRecyclerView.setAdapter(genreCatalogueAdapter);
 
-        genreCatalogueViewModel.getGenreList().observe(getViewLifecycleOwner(), genres -> genreCatalogueAdapter.setItems(genres));
+        genreCatalogueViewModel.getGenreList().observe(getViewLifecycleOwner(), genres -> { /* genreCatalogueAdapter.setItems(genres) */});
 
         bind.genreCatalogueRecyclerView.setOnTouchListener((v, event) -> {
             hideKeyboard(v);