diff --git a/Packages/ohif-hanging-protocols/client/protocolEngine.js b/Packages/ohif-hanging-protocols/client/protocolEngine.js
index 2e2555a43..5353e0bb5 100644
--- a/Packages/ohif-hanging-protocols/client/protocolEngine.js
+++ b/Packages/ohif-hanging-protocols/client/protocolEngine.js
@@ -569,6 +569,7 @@ HP.ProtocolEngine = class ProtocolEngine {
         // Loop through each viewport
         stageModel.viewports.forEach((viewport, viewportIndex) => {
             var details = this.matchImages(viewport);
+
             this.matchDetails[viewportIndex] = details;
 
             // Convert any YES/NO values into true/false for Cornerstone
@@ -625,7 +626,7 @@ HP.ProtocolEngine = class ProtocolEngine {
                 currentPosition++;
             }
 
-            if (currentMatch.imageId) {
+            if (currentMatch && currentMatch.imageId) {
                 currentViewportData.studyInstanceUid = currentMatch.studyInstanceUid;
                 currentViewportData.seriesInstanceUid = currentMatch.seriesInstanceUid;
                 currentViewportData.sopInstanceUid = currentMatch.sopInstanceUid;
diff --git a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
index 3d160ee01..62442c998 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
@@ -23,8 +23,7 @@ Template.viewerMain.onRendered(() => {
 
         // Toggle Measurement Table 
         // Show as default for Associated Studies
-        if(studies.length > 1) {
-            // Session.set('rightSidebar', 'measurements');
+        if(instance.data.currentTimepointId) {
             instance.data.state.set('rightSidebar', 'measurements');
         }
         // Hide as default for single study