diff --git a/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java b/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
index 2f592243..2180c914 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
@@ -170,7 +170,7 @@ public class MediaManager {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
                     if (mediaBrowserListenableFuture.isDone()) {
-                        if (playImmediatelyAfter) {
+                        if (playImmediatelyAfter  && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
                             enqueueDatabase(songs, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
                             mediaBrowserListenableFuture.get().addMediaItems(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItems(context, songs));
                         } else {
@@ -192,7 +192,7 @@ public class MediaManager {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
                     if (mediaBrowserListenableFuture.isDone()) {
-                        if (playImmediatelyAfter) {
+                        if (playImmediatelyAfter && mediaBrowserListenableFuture.get().getNextMediaItemIndex() != -1) {
                             enqueueDatabase(song, false, mediaBrowserListenableFuture.get().getNextMediaItemIndex());
                             mediaBrowserListenableFuture.get().addMediaItem(mediaBrowserListenableFuture.get().getNextMediaItemIndex(), MappingUtil.mapMediaItem(context, song));
                         } else {
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 4547b320..b18a5980 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
@@ -59,13 +59,14 @@ public class MainActivity extends BaseActivity {
         connectivityStatusBroadcastReceiver = new ConnectivityStatusBroadcastReceiver(this);
         connectivityStatusReceiverManager(true);
 
+        init();
         checkConnectionType();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        init();
+        initServiceContent();
     }
 
     @Override
@@ -94,7 +95,6 @@ public class MainActivity extends BaseActivity {
 
         initBottomSheet();
         initNavigation();
-        initServiceContent();
 
         if (PreferenceUtil.getInstance(this).getToken() != null) {
             goFromLogin();
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
index 31bfcff2..dac79dcc 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
@@ -97,11 +97,6 @@ public class PlayerBottomSheetFragment extends Fragment {
 
         initializeMediaBrowser();
         bindMediaController();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
         setMediaBrowserListenableFuture();
     }