diff --git a/src/com/android/car/media/localmediaplayer/Player.java b/src/com/android/car/media/localmediaplayer/Player.java
index 32ec372..8a6aae9 100644
--- a/src/com/android/car/media/localmediaplayer/Player.java
+++ b/src/com/android/car/media/localmediaplayer/Player.java
@@ -426,7 +426,7 @@
         // playing and a loading MediaPlayer and juggled between them while also calling
         // setNextMediaPlayer.
 
-        if (mQueue != null) {
+        if (mQueue != null && !mQueue.isEmpty()) {
             // Keep looping around when we run off the end of our current queue.
             mCurrentQueueIdx = (mCurrentQueueIdx + 1) % mQueue.size();
             playCurrentQueueIndex();