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 3461edf3..ccb5ada6 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
+++ b/app/src/main/java/com/cappielloantonio/play/service/MediaManager.java
@@ -28,10 +28,11 @@ public class MediaManager {
                     if (mediaBrowserListenableFuture.isDone()) {
                         if (mediaBrowserListenableFuture.get().isPlaying()) {
                             mediaBrowserListenableFuture.get().pause();
-                            mediaBrowserListenableFuture.get().stop();
-                            mediaBrowserListenableFuture.get().clearMediaItems();
-                            clearDatabase();
                         }
+
+                        mediaBrowserListenableFuture.get().stop();
+                        mediaBrowserListenableFuture.get().clearMediaItems();
+                        clearDatabase();
                     }
                 } catch (ExecutionException | InterruptedException e) {
                     Log.e(TAG, e.getMessage());
@@ -40,7 +41,7 @@ public class MediaManager {
         }
     }
 
-    public static void quit(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
+    public static void hide(ListenableFuture<MediaBrowser> mediaBrowserListenableFuture) {
         if (mediaBrowserListenableFuture != null) {
             mediaBrowserListenableFuture.addListener(() -> {
                 try {
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 eface1cb..67291d00 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
@@ -145,7 +145,7 @@ public class MainActivity extends BaseActivity {
 
                     switch (state) {
                         case BottomSheetBehavior.STATE_HIDDEN:
-                            resetMusicSession();
+                            hideMusicSession();
                             break;
                         case BottomSheetBehavior.STATE_COLLAPSED:
                             if (playerBottomSheetFragment != null) {
@@ -268,6 +268,10 @@ public class MainActivity extends BaseActivity {
         MediaManager.reset(getMediaBrowserListenableFuture());
     }
 
+    private void hideMusicSession() {
+        MediaManager.hide(getMediaBrowserListenableFuture());
+    }
+
     private void resetViewModel() {
         this.getViewModelStore().clear();
     }