diff --git a/ChangeLog b/ChangeLog
index ee2932ecc..8ee14789a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,7 @@
 release 0.14.5
 
 	* fixed bug when handling malformed webseed urls and an http proxy
+	* fixed bug when setting unlimited upload or download rates for torrents
 
 release 0.14.4
 
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 939557309..ac14847aa 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -4489,7 +4489,6 @@ namespace libtorrent
 	{
 		TORRENT_ASSERT(limit >= -1);
 		if (limit <= 0) limit = 0;
-		if (limit < num_peers() * 10) limit = num_peers() * 10;
 		m_bandwidth_channel[peer_connection::upload_channel].throttle(limit);
 	}
 
@@ -4504,7 +4503,6 @@ namespace libtorrent
 	{
 		TORRENT_ASSERT(limit >= -1);
 		if (limit <= 0) limit = 0;
-		if (limit < num_peers() * 10) limit = num_peers() * 10;
 		m_bandwidth_channel[peer_connection::download_channel].throttle(limit);
 	}