diff --git a/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js b/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
index 74383832c1..beac41cc47 100644
--- a/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
+++ b/services/web/frontend/js/ide/review-panel/controllers/ReviewPanelController.js
@@ -491,7 +491,7 @@ export default App.controller(
       if (!window.isRestrictedTokenMember) {
         if (rangesTracker.comments.length > 0) {
           ensureThreadsAreLoaded()
-        } else {
+        } else if (ide.$scope.loadingThreads === true) {
           // ensure that tracked changes are highlighted even if no comments are loaded
           ide.$scope.loadingThreads = false
           dispatchReviewPanelEvent('loaded_threads')