diff --git a/Packages/ohif-measurements/both/configuration/measurements.js b/Packages/ohif-measurements/both/configuration/measurements.js
index e32512b4a..29cbc8c2f 100644
--- a/Packages/ohif-measurements/both/configuration/measurements.js
+++ b/Packages/ohif-measurements/both/configuration/measurements.js
@@ -201,7 +201,11 @@ class MeasurementApi {
 
                     measurements.forEach(measurement => {
                         delete measurement._id;
-                        this.tools[measurement.toolType].insert(measurement);
+                        // @TODO: check if this conditional is ok, because is throwing 
+                        // an error for temp measurements -> measurement.toolType is undefined
+                        if(measurement.toolType && this.tools[measurement.toolType]) {
+                            this.tools[measurement.toolType].insert(measurement);
+                        }
                     });
                 });
 
diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js
index 060a6db02..7aebf54cc 100644
--- a/Packages/ohif-viewerbase/package.js
+++ b/Packages/ohif-viewerbase/package.js
@@ -18,7 +18,6 @@ Package.onUse(function(api) {
     // Our custom packages
     api.use('ohif:design');
     api.use('ohif:core');
-    api.use('ohif:cornerstone');
     api.use('ohif:log');
 
     const assets = [