diff --git a/include/libtorrent/torrent.hpp b/include/libtorrent/torrent.hpp
index b286d42cc..2ee583862 100644
--- a/include/libtorrent/torrent.hpp
+++ b/include/libtorrent/torrent.hpp
@@ -999,11 +999,16 @@ namespace libtorrent
 		// this is true while tracker announcing is enabled
 		// is is disabled while paused and checking files
 		bool m_announcing:1;
+
+		// this is true while the tracker deadline timer
+		// is in use. i.e. one or more trackers are waiting
+		// for a reannounce
+		bool m_waiting_tracker:1;
 	};
 
 	inline ptime torrent::next_announce() const
 	{
-		return m_tracker_timer.expires_at();
+		return m_waiting_tracker?m_tracker_timer.expires_at():min_time();
 	}
 
 	inline void torrent::force_tracker_request()
diff --git a/src/torrent.cpp b/src/torrent.cpp
index b3e1fb7b2..92196fbdb 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -192,6 +192,7 @@ namespace libtorrent
 		, m_has_incoming(false)
 		, m_files_checked(false)
 		, m_announcing(false)
+		, m_waiting_tracker(false)
 	{
 		if (resume_data) m_resume_data.swap(*resume_data);
 
@@ -270,6 +271,7 @@ namespace libtorrent
 		, m_has_incoming(false)
 		, m_files_checked(false)
 		, m_announcing(false)
+		, m_waiting_tracker(false)
 	{
 		if (resume_data) m_resume_data.swap(*resume_data);
 
@@ -957,7 +959,7 @@ namespace libtorrent
 	void torrent::on_tracker_announce()
 	{
 		session_impl::mutex_t::scoped_lock l(m_ses.m_mutex);
-	
+		m_waiting_tracker = false;	
 		if (m_abort) return;
 		announce_with_tracker();
 	}
@@ -4451,6 +4453,7 @@ namespace libtorrent
 		boost::weak_ptr<torrent> self(shared_from_this());
 		m_tracker_timer.expires_at(next_announce, ec);
 		m_tracker_timer.async_wait(bind(&torrent::on_tracker_announce_disp, self, _1));
+		m_waiting_tracker = true;
 	}
 
 	void torrent::start_announcing()
@@ -4927,9 +4930,13 @@ namespace libtorrent
 		st.download_payload_rate = m_stat.download_payload_rate();
 		st.upload_payload_rate = m_stat.upload_payload_rate();
 
-		st.next_announce = boost::posix_time::seconds(
-			total_seconds(next_announce() - now));
-		if (st.next_announce.is_negative() || is_paused())
+		if (m_waiting_tracker && !is_paused())
+			st.next_announce = boost::posix_time::seconds(
+				total_seconds(next_announce() - now));
+		else
+			st.next_announce = boost::posix_time::seconds(0);
+
+		if (st.next_announce.is_negative())
 			st.next_announce = boost::posix_time::seconds(0);
 
 		st.announce_interval = boost::posix_time::seconds(0);