diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
index 846fc124..24a1e70c 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/DiscoverSongAdapter.java
@@ -103,6 +103,7 @@ public class DiscoverSongAdapter extends RecyclerView.Adapter<DiscoverSongAdapte
         @Override
         public void onClick(View view) {
             MediaManager.startQueue(mediaBrowserListenableFuture, context, songs.get(getBindingAdapterPosition()));
+            activity.setBottomSheetInPeek(true);
 
             SongRepository songRepository = new SongRepository(App.getInstance());
             songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
index aeea92cf..b8b90370 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SimilarTrackAdapter.java
@@ -22,6 +22,7 @@ import com.cappielloantonio.play.interfaces.MediaCallback;
 import com.cappielloantonio.play.model.Song;
 import com.cappielloantonio.play.repository.SongRepository;
 import com.cappielloantonio.play.service.MediaManager;
+import com.cappielloantonio.play.ui.activity.MainActivity;
 import com.cappielloantonio.play.util.MusicUtil;
 import com.google.common.util.concurrent.ListenableFuture;
 
@@ -31,13 +32,15 @@ import java.util.List;
 public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapter.ViewHolder> {
     private static final String TAG = "SimilarTrackAdapter";
 
+    private final MainActivity activity;
     private final Context context;
     private final LayoutInflater mInflater;
 
     private ListenableFuture<MediaBrowser> mediaBrowserListenableFuture;
     private List<Song> songs;
 
-    public SimilarTrackAdapter(Context context) {
+    public SimilarTrackAdapter(MainActivity activity, Context context) {
+        this.activity = activity;
         this.context = context;
         this.mInflater = LayoutInflater.from(context);
         this.songs = new ArrayList<>();
@@ -98,6 +101,7 @@ public class SimilarTrackAdapter extends RecyclerView.Adapter<SimilarTrackAdapte
         @Override
         public void onClick(View view) {
             MediaManager.startQueue(mediaBrowserListenableFuture, context, songs.get(getBindingAdapterPosition()));
+            activity.setBottomSheetInPeek(true);
 
             SongRepository songRepository = new SongRepository(App.getInstance());
             songRepository.getInstantMix(songs.get(getBindingAdapterPosition()), 20, new MediaCallback() {
diff --git a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
index 06aa6227..8f74c2b8 100644
--- a/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
+++ b/app/src/main/java/com/cappielloantonio/play/adapter/SongHorizontalAdapter.java
@@ -129,6 +129,7 @@ public class SongHorizontalAdapter extends RecyclerView.Adapter<SongHorizontalAd
         @Override
         public void onClick(View view) {
             MediaManager.startQueue(mediaBrowserListenableFuture, context, songs, getBindingAdapterPosition());
+            mainActivity.setBottomSheetInPeek(true);
         }
 
         @Override
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
index 0fa18e59..7e9d48d5 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/MainActivity.java
@@ -1,14 +1,20 @@
 package com.cappielloantonio.play.ui.activity;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.media3.common.MediaMetadata;
+import androidx.media3.common.PlaybackParameters;
+import androidx.media3.common.Player;
+import androidx.media3.common.TracksInfo;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.NavigationUI;
@@ -26,8 +32,10 @@ import com.cappielloantonio.play.util.PreferenceUtil;
 import com.cappielloantonio.play.viewmodel.MainViewModel;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.common.util.concurrent.MoreExecutors;
 
 import java.util.Objects;
+import java.util.concurrent.ExecutionException;
 
 public class MainActivity extends BaseActivity {
     private static final String TAG = "MainActivity";
@@ -56,13 +64,13 @@ public class MainActivity extends BaseActivity {
         connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this);
         connectivityStatusReceiverManager(true);
 
-        init();
         checkConnectionType();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+        init();
         pingServer();
     }
 
@@ -95,15 +103,19 @@ public class MainActivity extends BaseActivity {
     }
 
     // BOTTOM SHEET/NAVIGATION
+    @SuppressLint("UnsafeOptInUsageError")
     private void initBottomSheet() {
         bottomSheetBehavior = BottomSheetBehavior.from(findViewById(R.id.player_bottom_sheet));
         bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallback);
         fragmentManager.beginTransaction().replace(R.id.player_bottom_sheet, new PlayerBottomSheetFragment(), "PlayerBottomSheet").commit();
 
-        /*
-         * All'apertura mostro il bottom sheet solo se in coda c'è qualcosa
-         */
-        setBottomSheetInPeek(mainViewModel.isQueueLoaded());
+        getMediaBrowserListenableFuture().addListener(() -> {
+            try {
+                setBottomSheetInPeek(getMediaBrowserListenableFuture().get().getMediaItemCount() > 0);
+            } catch (ExecutionException | InterruptedException e) {
+                e.printStackTrace();
+            }
+        }, MoreExecutors.directExecutor());
     }
 
     public void setBottomSheetInPeek(Boolean isVisible) {
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
index 43ce36f2..3daf5a83 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/HomeFragment.java
@@ -264,7 +264,7 @@ public class HomeFragment extends Fragment {
         bind.similarTracksRecyclerView.setLayoutManager(new LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false));
         bind.similarTracksRecyclerView.setHasFixedSize(true);
 
-        similarMusicAdapter = new SimilarTrackAdapter(requireContext());
+        similarMusicAdapter = new SimilarTrackAdapter(activity, requireContext());
         bind.similarTracksRecyclerView.setAdapter(similarMusicAdapter);
         homeViewModel.getStarredTracksSample().observe(requireActivity(), songs -> {
             if (songs == null) {