diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/doubleClickCallback.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/doubleClickCallback.js
index 5cb0b37b4..845b10e26 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/doubleClickCallback.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/doubleClickCallback.js
@@ -18,6 +18,13 @@ export default function (event) {
         return false;
     }
 
+    // Check if the element is enabled and stop here if not
+    try {
+        cornerstone.getEnabledElement(element);
+    } catch (error) {
+        return;
+    }
+
     const config = cornerstoneTools.bidirectional.getConfiguration();
 
     const coords = eventData.currentPoints.canvas;
diff --git a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
index 54906b006..860c13efd 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/nonTargetTool.js
@@ -419,6 +419,13 @@ function doubleClickCallback(e) {
         return false;
     }
 
+    // Check if the element is enabled and stop here if not
+    try {
+        cornerstone.getEnabledElement(element);
+    } catch (error) {
+        return;
+    }
+
     const config = cornerstoneTools.nonTarget.getConfiguration();
 
     const coords = eventData.currentPoints.canvas;
diff --git a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
index 99fcafa78..0e1bf15dc 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/qualitativeTargetTools.js
@@ -430,6 +430,13 @@ function createQualitativeTargetTool(toolType, responseText='') {
             return false;
         }
 
+        // Check if the element is enabled and stop here if not
+        try {
+            cornerstone.getEnabledElement(element);
+        } catch (error) {
+            return;
+        }
+
         const config = cornerstoneTools[toolType].getConfiguration();
 
         const coords = eventData.currentPoints.canvas;
diff --git a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
index d19e7d09d..8409c08a8 100644
--- a/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
+++ b/Packages/ohif-measurements/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
@@ -66,14 +66,14 @@ Template[defaultTemplate].helpers({
             const date = moment(patientBirthDate, 'YYYYMMDD');
             const yearDiff = moment().diff(date, 'years');
             if (yearDiff) {
-                values.push(yearDiff + 'Y').padStart(4, '0');
+                values.push((yearDiff + 'Y').padStart(4, '0'));
             } else {
                 const monthDiff = moment().diff(date, 'months');
                 if (monthDiff) {
-                    values.push(monthDiff + 'M').padStart(4, '0');
+                    values.push((monthDiff + 'M').padStart(4, '0'));
                 } else {
                     const dayDiff = moment().diff(date, 'days') || 0;
-                    values.push(dayDiff + 'D').padStart(4, '0');
+                    values.push((dayDiff + 'D').padStart(4, '0'));
                 }
             }
         }
diff --git a/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js b/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
index 946658032..7b312f738 100644
--- a/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
+++ b/Packages/ohif-viewerbase/client/components/studyBrowser/imageThumbnail/imageThumbnail.js
@@ -63,7 +63,9 @@ Template.imageThumbnail.onRendered(() => {
 
             cornerstone.displayImage(element, image);
 
-            $element.one('cornerstoneimagerendered', () => {
+            $element.one('cornerstoneimagerendered', event => {
+                const eventData = event.originalEvent.detail;
+                const { element } = eventData;
                 const enabledElement = cornerstone.getEnabledElement(element);
 
                 // Create a static image from
@@ -72,8 +74,10 @@ Template.imageThumbnail.onRendered(() => {
                 const dataUrl = enabledElement.canvas.toDataURL('image/jpeg', 1);
                 imageElement.src = dataUrl;
 
-                // Disable cornerstone for thumbnail element and remove its canvas
-                cornerstone.disable(element);
+                // Try to disable cornerstone for thumbnail element and remove its canvas
+                try {
+                    cornerstone.disable(element);
+                } catch (e) {}
 
                 $element.append(imageElement);
 
@@ -117,7 +121,11 @@ Template.imageThumbnail.onDestroyed(() => {
     const $parent = instance.$('.imageThumbnail');
     const $element = $parent.find('.imageThumbnailCanvas');
     const element = $element.get(0);
-    cornerstone.disable(element);
+
+    // Try to disable the element if it still exists
+    try {
+        cornerstone.disable(element);
+    } catch (e) {}
 });
 
 Template.imageThumbnail.helpers({