diff --git a/StreamingKit/StreamingKit/STKAudioPlayer.m b/StreamingKit/StreamingKit/STKAudioPlayer.m
index b445dbd..7cfac01 100644
--- a/StreamingKit/StreamingKit/STKAudioPlayer.m
+++ b/StreamingKit/StreamingKit/STKAudioPlayer.m
@@ -2785,10 +2785,6 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
                 }
             }
         }
-
-        OSSpinLockLock(&currentEntryReferencesLock);
-        currentlyReadingEntry = nil;
-        OSSpinLockUnlock(&currentEntryReferencesLock);
     }
     else
     {
@@ -2796,6 +2792,11 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
         self.internalState = AudioPlayerInternalStateStopped;
     }
     
+    OSSpinLockLock(&currentEntryReferencesLock);
+    currentlyReadingEntry = nil;
+    OSSpinLockUnlock(&currentEntryReferencesLock);
+
+    
     pthread_mutex_unlock(&playerMutex);
 }
 
@@ -2920,7 +2921,7 @@ static void AudioQueueIsRunningCallbackProc(void* userData, AudioQueueRef audioQ
         
         [self invokeOnPlaybackThread:^
         {
-            pthread_mutex_lock(&playerMutex);
+            pthread_mutex_lock(&queueBuffersMutex);
             disposeWasRequested = YES;
             pthread_mutex_unlock(&queueBuffersMutex);
         }];