diff --git a/ChangeLog b/ChangeLog
index e3d26d499..384a645a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@ release 0.14.5
 	  the resume data
 	* fixed resume data compatibility with 0.13
 	* fixed rare piece-picker bug
+	* fixed bug where one allowed-fast message would be sent even when
+	  disabled
 
 release 0.14.4
 
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 82da3fca2..022d3bc8d 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -448,6 +448,8 @@ namespace libtorrent
 		}
 
 		int num_allowed_pieces = m_ses.settings().allowed_fast_set_size;
+		if (num_allowed_pieces == 0) return;
+
 		int num_pieces = t->torrent_file().num_pieces();
 
 		if (num_allowed_pieces >= num_pieces)