diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp
index 2331aaff92..b408fca896 100644
--- a/src/audio_core/sink/sink_stream.cpp
+++ b/src/audio_core/sink/sink_stream.cpp
@@ -273,9 +273,12 @@ void SinkStream::WaitFreeSpace() {
     std::unique_lock lk{release_mutex};
     release_cv.wait_for(lk, std::chrono::milliseconds(5),
                         [this]() { return queued_buffers < max_queue_size; });
+#ifndef ANDROID
+    // This wait can cause a problematic shutdown hang on Android.
     if (queued_buffers > max_queue_size + 3) {
         release_cv.wait(lk, [this]() { return queued_buffers < max_queue_size; });
     }
+#endif
 }
 
 } // namespace AudioCore::Sink