diff --git a/gradle.properties b/gradle.properties
index c791eda7f..1f367d018 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 android.enableJetifier=true
 android.useAndroidX=true
 android.enableR8=false
-
+android.enableSeparateAnnotationProcessing=true
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
index 12ac57bbc..a871fdbed 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserFragment.java
@@ -320,7 +320,7 @@ public class AudioBrowserFragment extends BaseAudioBrowser implements SwipeRefre
             mSwipeRefreshLayout.setEnabled(((LinearLayoutManager)getCurrentRV().getLayoutManager()).findFirstVisibleItemPosition() <= 0);
             updateEmptyView();
             mFastScroller.setRecyclerView(getCurrentRV(), getViewModel());
-        }
+        } else setFabPlayShuffleAllVisibility();
     }
 
     @Override