diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
index 7b5ff15..0fd08b0 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
@@ -165,7 +165,7 @@ fun NonQueuedMediaItemMenu(
 @Composable
 fun QueuedMediaItemMenu(
     mediaItem: MediaItem,
-    indexInQueue: Int,
+    indexInQueue: Int?,
     modifier: Modifier = Modifier,
     onDismiss: (() -> Unit)? = null,
     onGlobalRouteEmitted: (() -> Unit)? = null
@@ -176,9 +176,9 @@ fun QueuedMediaItemMenu(
     BaseMediaItemMenu(
         mediaItem = mediaItem,
         onDismiss = onDismiss ?: menuState::hide,
-        onRemoveFromQueue = {
+        onRemoveFromQueue = if (indexInQueue != null) ({
             player?.removeMediaItem(indexInQueue)
-        },
+        }) else null,
         onGlobalRouteEmitted = onGlobalRouteEmitted,
         modifier = modifier
     )
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt
index 1dc9082..151c011 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt
@@ -100,7 +100,7 @@ fun CurrentPlaylistView(
                 menuContent = {
                     QueuedMediaItemMenu(
                         mediaItem = mediaItem,
-                        indexInQueue = index,
+                        indexInQueue = if (isPlayingThisMediaItem) null else index,
                         onGlobalRouteEmitted = onGlobalRouteEmitted
                     )
                 },
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
index f26cc7f..6d42716 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
@@ -219,7 +219,7 @@ fun PlayerView(
                             menuState.display {
                                 QueuedMediaItemMenu(
                                     mediaItem = playerState.mediaItem ?: MediaItem.EMPTY,
-                                    indexInQueue = playerState.mediaItemIndex,
+                                    indexInQueue = null,
                                     onDismiss = menuState::hide,
                                     onGlobalRouteEmitted = layoutState.collapse
                                 )