diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicIndexAdapter.java b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicIndexAdapter.java
index 6f148123..49bbc49d 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicIndexAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/adapter/MusicIndexAdapter.java
@@ -60,7 +60,7 @@ public class MusicIndexAdapter extends RecyclerView.Adapter<MusicIndexAdapter.Vi
 
     @Override
     public String getTextToShowInBubble(int pos) {
-        return Character.toString(Objects.requireNonNull(artists.get(pos).getName().toUpperCase()).charAt(0));
+        return artists != null && !artists.isEmpty() ? Character.toString(Objects.requireNonNull(artists.get(pos).getName().toUpperCase()).charAt(0)) : null;
     }
 
     public class ViewHolder extends RecyclerView.ViewHolder {
diff --git a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/IndexFragment.java b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/IndexFragment.java
index 675fe141..97fd580c 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/IndexFragment.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/ui/fragment/IndexFragment.java
@@ -85,13 +85,15 @@ public class IndexFragment extends Fragment implements ClickCallback {
     }
 
     private void initDirectoryListView() {
+        MusicFolder musicFolder = getArguments().getParcelable(Constants.MUSIC_FOLDER_OBJECT);
+
         bind.indexRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         bind.indexRecyclerView.setHasFixedSize(true);
 
         musicIndexAdapter = new MusicIndexAdapter(this);
         bind.indexRecyclerView.setAdapter(musicIndexAdapter);
 
-        indexViewModel.getIndexes().observe(getViewLifecycleOwner(), indexes -> {
+        indexViewModel.getIndexes(musicFolder != null ? musicFolder.getId() : null).observe(getViewLifecycleOwner(), indexes -> {
             if (indexes != null) {
                 musicIndexAdapter.setItems(IndexUtil.getArtist(indexes));
             }
diff --git a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
index 60a0b913..9cfa67f5 100644
--- a/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
+++ b/app/src/main/java/com/cappielloantonio/tempo/viewmodel/IndexViewModel.java
@@ -23,8 +23,8 @@ public class IndexViewModel extends AndroidViewModel {
         directoryRepository = new DirectoryRepository();
     }
 
-    public MutableLiveData<Indexes> getIndexes() {
-        return directoryRepository.getIndexes(null, null);
+    public MutableLiveData<Indexes> getIndexes(String musicFolderId) {
+        return directoryRepository.getIndexes(musicFolderId, null);
     }
 
     public String getMusicFolderName() {