diff --git a/src/client/sound_openal_internal.cpp b/src/client/sound_openal_internal.cpp
index 26890a074..5ab9e4c7c 100644
--- a/src/client/sound_openal_internal.cpp
+++ b/src/client/sound_openal_internal.cpp
@@ -730,10 +730,13 @@ f32 PlayingSound::getGain() noexcept
 void OpenALSoundManager::stepStreams(f32 dtime)
 {
 	// spread work across steps
-	int num_issued_sounds = std::ceil(m_sounds_streaming_current_bigstep.size()
-			* dtime / m_stream_timer);
+	const size_t num_issued_sounds = std::min(
+			m_sounds_streaming_current_bigstep.size(),
+			(size_t)std::ceil(m_sounds_streaming_current_bigstep.size()
+				* dtime / m_stream_timer)
+		);
 
-	for (; num_issued_sounds > 0; --num_issued_sounds) {
+	for (size_t i = 0; i < num_issued_sounds; ++i) {
 		auto wptr = std::move(m_sounds_streaming_current_bigstep.back());
 		m_sounds_streaming_current_bigstep.pop_back();