diff --git a/libtransmission/announcer.c b/libtransmission/announcer.c
index 08a5fb883..4c43d1813 100644
--- a/libtransmission/announcer.c
+++ b/libtransmission/announcer.c
@@ -1112,6 +1112,11 @@ on_announce_done( const tr_announce_response  * response,
                 dbgmsg( tier, "tracker gave \"%s\"", str );
                 publishWarning( tier, str );
             }
+            else
+            {
+                tr_strlcpy( tier->lastAnnounceStr, _( "Success" ),
+                            sizeof( tier->lastAnnounceStr ) );
+            }
 
             if(( i = response->min_interval ))
                 tier->announceMinIntervalSec = i;
@@ -1127,10 +1132,6 @@ on_announce_done( const tr_announce_response  * response,
                 publishPeersPex( tier, response->seeders, response->leechers,
                                  response->pex6, response->pex6_count );
 
-            if( !*tier->lastAnnounceStr )
-                tr_strlcpy( tier->lastAnnounceStr, _( "Success" ),
-                            sizeof( tier->lastAnnounceStr ) );
-
             tier->isRunning = data->isRunningOnSuccess;
 
             /* if the tracker included scrape fields in its announce response,