diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 74a10e0d8..2e6a57d37 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -118,13 +118,17 @@ Template.viewer.onCreated(() => {
         OHIF.lesiontracker.toggleLesionTrackerToolsButtons(false);
     }
 
+    let firstMeasurementActivated = false;
     instance.autorun(() => {
         if (!Session.get('TimepointsReady') ||
             !Session.get('MeasurementsReady') ||
-            !Session.get('ViewerMainReady')) {
+            !Session.get('ViewerMainReady') ||
+            firstMeasurementActivated) {
             return;
         }
 
+
+
         // Find and activate the first measurement by Lesion Number
         // NOTE: This is inefficient, we should be using a hanging protocol
         // to hang the first measurement's imageId immediately, rather
@@ -165,6 +169,8 @@ Template.viewer.onCreated(() => {
         if (rowItem) {
             OHIF.measurements.jumpToRowItem(rowItem, timepoints);
         }
+
+        firstMeasurementActivated = true;
     })
 });