diff --git a/ChangeLog b/ChangeLog
index 209eb2159..e25b91794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
 	  incoming connection
 	* added more detailed instrumentation of the disk I/O thread
 
+	* no peers from tracker when stopping is no longer an error
 	* improved web seed retry behavior
 	* fixed announce issue
 
diff --git a/src/http_tracker_connection.cpp b/src/http_tracker_connection.cpp
index d061cc9c7..b8032fb79 100644
--- a/src/http_tracker_connection.cpp
+++ b/src/http_tracker_connection.cpp
@@ -464,7 +464,9 @@ namespace libtorrent
 		lazy_entry const* ipv6_peers = 0;
 #endif
 
-		if (peers_ent == 0 && ipv6_peers == 0)
+		// if we didn't receive any peers. We don't care if we're stopping anyway
+		if (peers_ent == 0 && ipv6_peers == 0
+			&& tracker_req().event != tracker_request::stopped)
 		{
 			fail(error_code(errors::invalid_peers_entry), -1, ""
 				, interval, min_interval);