diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
index b38ffa44..f984a291 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/DownloadFragment.java
@@ -121,25 +121,30 @@ public class DownloadFragment extends Fragment implements ClickCallback {
         downloadHorizontalAdapter = new DownloadHorizontalAdapter(this);
         bind.downloadedTracksRecyclerView.setAdapter(downloadHorizontalAdapter);
         downloadViewModel.getDownloadedTracks(getViewLifecycleOwner()).observe(getViewLifecycleOwner(), songs -> {
-            if (songs == null || songs.isEmpty()) {
-                if (bind != null) {
-                    bind.emptyDownloadLayout.setVisibility(View.VISIBLE);
-                    bind.fragmentDownloadNestedScrollView.setVisibility(View.GONE);
+            if (songs != null) {
+                if (songs.isEmpty()) {
+                    if (bind != null) {
+                        bind.emptyDownloadLayout.setVisibility(View.VISIBLE);
+                        bind.fragmentDownloadNestedScrollView.setVisibility(View.GONE);
 
-                    bind.downloadDownloadedTracksPlaceholder.placeholder.setVisibility(View.VISIBLE);
-                    bind.downloadDownloadedTracksSector.setVisibility(View.GONE);
+                        bind.downloadDownloadedTracksPlaceholder.placeholder.setVisibility(View.VISIBLE);
+                        bind.downloadDownloadedTracksSector.setVisibility(View.GONE);
+                    }
+                } else {
+                    if (bind != null) {
+                        bind.emptyDownloadLayout.setVisibility(View.GONE);
+                        bind.fragmentDownloadNestedScrollView.setVisibility(View.VISIBLE);
+
+                        bind.downloadDownloadedTracksPlaceholder.placeholder.setVisibility(View.GONE);
+                        bind.downloadDownloadedTracksSector.setVisibility(View.VISIBLE);
+
+                        bind.downloadedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
+
+                        downloadHorizontalAdapter.setItems(songs);
+                    }
                 }
-            } else {
-                if (bind != null) {
-                    bind.emptyDownloadLayout.setVisibility(View.GONE);
-                    bind.fragmentDownloadNestedScrollView.setVisibility(View.VISIBLE);
 
-                    bind.downloadDownloadedTracksPlaceholder.placeholder.setVisibility(View.GONE);
-                    bind.downloadDownloadedTracksSector.setVisibility(View.VISIBLE);
-                    bind.downloadedTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
-
-                    downloadHorizontalAdapter.setItems(songs);
-                }
+                if (bind != null) bind.loadingProgressBar.setVisibility(View.GONE);
             }
         });
     }
diff --git a/app/src/main/res/layout/fragment_download.xml b/app/src/main/res/layout/fragment_download.xml
index a8dfd7be..bfd452a3 100644
--- a/app/src/main/res/layout/fragment_download.xml
+++ b/app/src/main/res/layout/fragment_download.xml
@@ -39,6 +39,15 @@
         </com.google.android.material.appbar.MaterialToolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
+    <ProgressBar
+        android:id="@+id/loading_progress_bar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:minWidth="128dp" />
+
     <LinearLayout
         android:id="@+id/empty_download_layout"
         android:layout_width="match_parent"
@@ -79,6 +88,7 @@
         android:id="@+id/fragment_download_nested_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:visibility="gone"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout