diff --git a/client/src/store/historyStore/model/watchHistory.js b/client/src/store/historyStore/model/watchHistory.js
index dbc8ff9543f..f648cc670ff 100644
--- a/client/src/store/historyStore/model/watchHistory.js
+++ b/client/src/store/historyStore/model/watchHistory.js
@@ -22,6 +22,8 @@ let lastUpdateTime = null;
 let lastRequestDate = new Date();
 
 export async function watchHistory() {
+    // "Reset" watchTimeout so we don't queue up watchHistory calls in rewatchHistory.
+    watchTimeout = null;
     // get current history
     const history = await getCurrentHistoryFromServer();
     const historyId = history.id;