diff --git a/Packages/lesiontracker/client/compatibility/LesionManager.js b/Packages/lesiontracker/client/compatibility/LesionManager.js
index 1a59a3bed..28c4df051 100644
--- a/Packages/lesiontracker/client/compatibility/LesionManager.js
+++ b/Packages/lesiontracker/client/compatibility/LesionManager.js
@@ -93,6 +93,13 @@ var LesionManager = (function() {
             // Insert this into the Measurements Collection
             // Save the ID into the toolData (not sure if this works?)
             measurement.id = Measurements.insert(measurement);
+
+            // Update the database entry so it can be readded next time the study is loaded
+            Measurements.update(measurement.id, {
+                $set: {
+                    toolDataInsertedManually: false
+                }
+            });
         } else {
             lesionData.id = existingMeasurement._id;
 
diff --git a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
index a22273238..5887e48a2 100644
--- a/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/client/components/lesionTable/lesionTable.js
@@ -75,7 +75,10 @@ Template.lesionTable.onRendered(function() {
     // timepointLoaded property is used to put indicator for loaded timepoints in viewport
     self.autorun(function() {
         // Temporary until we have a real window manager with events for series/study changed
-        Session.get('NewSeriesLoaded');
+        if (!Session.get('NewSeriesLoaded')) {
+            return;
+        }
+
         console.log('ViewerData changed, check for displayed timepoints');
 
         // Get study dates of imageViewerViewport elements
@@ -110,6 +113,8 @@ Template.lesionTable.onRendered(function() {
 
         var timepoints = Timepoints.find({
             patientId: loadedStudyDates.patientId
+        }, {
+            reactive: false
         });
 
         timepoints.forEach(function(timepoint) {
@@ -124,5 +129,8 @@ Template.lesionTable.onRendered(function() {
                 }
             });
         });
+
+        // Temporary until we have a real window manager with events for series/study changed
+        Session.set('NewSeriesLoaded', false);
     });
 });
diff --git a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index da1e5c0b3..8679dcbb9 100644
--- a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -322,6 +322,7 @@ function loadSeriesIntoViewport(data, templateData) {
         }
 
         // Temporary until we have a real window manager with events for series/study changed
+        console.log('Set NewSeriesLoaded');
         Session.set('NewSeriesLoaded', Random.id());
 
         // Run any renderedCallback that exists in the data context