diff --git a/src/servers/media/BufferManager.cpp b/src/servers/media/BufferManager.cpp
index d9a0b7779e..967f55468e 100644
--- a/src/servers/media/BufferManager.cpp
+++ b/src/servers/media/BufferManager.cpp
@@ -158,7 +158,7 @@ BufferManager::CleanupTeam(team_id team)
 			PRINT(1, "BufferManager::CleanupTeam: removing buffer id %"
 				B_PRId32 " that has no teams\n", entry.key.GetHashCode());
 			_ReleaseClonedArea(entry.value.area);
-			iterator.Remove();
+			fBufferInfoMap.Remove(iterator);
 		}
 	}
 }