diff --git a/include/libtorrent/bandwidth_manager.hpp b/include/libtorrent/bandwidth_manager.hpp
index 75e1f1d4e..b0ff342a4 100644
--- a/include/libtorrent/bandwidth_manager.hpp
+++ b/include/libtorrent/bandwidth_manager.hpp
@@ -398,6 +398,7 @@ private:
 					block_size = m_limit
 						/ (m_limit / max_bandwidth_block_size);
 				}
+				if (block_size > qe.max_block_size) block_size = qe.max_block_size;
 			}
 
 			if (amount < block_size / 2)