diff --git a/Packages/ohif-measurements/both/configuration/measurements.js b/Packages/ohif-measurements/both/configuration/measurements.js
index dee5f6735..bd60196d9 100644
--- a/Packages/ohif-measurements/both/configuration/measurements.js
+++ b/Packages/ohif-measurements/both/configuration/measurements.js
@@ -53,7 +53,10 @@ class MeasurementApi {
                     });
                     if (baselineGroupEntry) {
                         const tool = this.tools[baselineGroupEntry.toolId];
-                        location = tool.findOne({ measurementNumber }).location;
+                        const found = tool.findOne({ measurementNumber });
+                        if (found) {
+                            location = found.location;
+                        }
                     }
 
                     // Reflect the entry in the tool group collection