diff --git a/Audjustable/Classes/AudioPlayer/AudioPlayer.m b/Audjustable/Classes/AudioPlayer/AudioPlayer.m
index 8ec9af3..26cef02 100644
--- a/Audjustable/Classes/AudioPlayer/AudioPlayer.m
+++ b/Audjustable/Classes/AudioPlayer/AudioPlayer.m
@@ -1410,7 +1410,11 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
         
         if (currentlyReadingEntry == nil)
         {
-            self.internalState = AudioPlayerInternalStateStopping;
+			if (upcomingQueue.count == 0)
+			{
+				stopReason = AudioPlayerStopReasonNoStop;
+				self.internalState = AudioPlayerInternalStateStopping;
+			}
         }
         
         if (nextIsDifferent && entry)