diff --git a/extensions/dicom-rt/src/components/RTPanel/RTPanel.js b/extensions/dicom-rt/src/components/RTPanel/RTPanel.js
index c9da41006..f0bfa02c2 100644
--- a/extensions/dicom-rt/src/components/RTPanel/RTPanel.js
+++ b/extensions/dicom-rt/src/components/RTPanel/RTPanel.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import cornerstoneTools from 'cornerstone-tools';
 import cornerstone from 'cornerstone-core';
diff --git a/extensions/dicom-segmentation/src/components/SegmentationPanel/SegmentationPanel.js b/extensions/dicom-segmentation/src/components/SegmentationPanel/SegmentationPanel.js
index d54d0237e..324d05da3 100644
--- a/extensions/dicom-segmentation/src/components/SegmentationPanel/SegmentationPanel.js
+++ b/extensions/dicom-segmentation/src/components/SegmentationPanel/SegmentationPanel.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import cornerstoneTools from 'cornerstone-tools';
 import cornerstone from 'cornerstone-core';
@@ -224,10 +224,7 @@ const SegmentationPanel = ({
         )
       );
     };
-  }, [
-    activeIndex,
-    viewports,
-  ]);
+  }, [activeIndex, viewports]);
 
   const updateSegmentationComboBox = e => {
     const index = e.detail.activatedLabelmapIndex;
@@ -694,7 +691,7 @@ const SegmentationPanel = ({
           count={state.segmentList.length}
           isVisible={
             state.segmentsHidden.filter(isHidden => isHidden === true).length <
-            state.segmentNumbers.length && state.segmentNumbers.length > 0
+              state.segmentNumbers.length && state.segmentNumbers.length > 0
           }
           onVisibilityChange={onVisibilityChangeHandler}
         >
diff --git a/platform/core/src/classes/StudyLoadingListener.js b/platform/core/src/classes/StudyLoadingListener.js
index d00bdaadc..acbd49103 100644
--- a/platform/core/src/classes/StudyLoadingListener.js
+++ b/platform/core/src/classes/StudyLoadingListener.js
@@ -469,8 +469,8 @@ class StudyLoadingListener {
 
       // TODO: Make this work for plugins
       if (!stack) {
-        console.warn('Skipping adding displaySet to StudyLoadingListener');
-        console.warn(displaySet);
+        //console.warn('Skipping adding displaySet to StudyLoadingListener');
+        //console.warn(displaySet);
         return;
       }
 
diff --git a/platform/core/src/classes/metadata/StudyMetadata.js b/platform/core/src/classes/metadata/StudyMetadata.js
index ad881b18a..ae5aac296 100644
--- a/platform/core/src/classes/metadata/StudyMetadata.js
+++ b/platform/core/src/classes/metadata/StudyMetadata.js
@@ -350,6 +350,13 @@ class StudyMetadata extends Metadata {
               referencedSeriesInstanceUID
             );
           } else {
+            if (
+              !displaySet.referencedDisplaySets ||
+              displaySet.referencedDisplaySets.length === 0
+            ) {
+              return false;
+            }
+
             const filteredReferencedDisplaySets = displaySet.referencedDisplaySets.filter(
               referencedDisplaySet =>
                 referencedDisplaySet.SeriesInstanceUID ===
diff --git a/platform/core/src/services/MeasurementService/MeasurementService.js b/platform/core/src/services/MeasurementService/MeasurementService.js
index 888a2501d..639fc7e37 100644
--- a/platform/core/src/services/MeasurementService/MeasurementService.js
+++ b/platform/core/src/services/MeasurementService/MeasurementService.js
@@ -420,6 +420,10 @@ class MeasurementService {
       throw new Error('No source definition provided.');
     }
 
+    if (definition == 'stack' || definition == 'stackPrefetch') {
+      return;
+    }
+
     const sourceInfo = this._getSourceInfo(source);
 
     if (!this._sourceHasMappings(source)) {
diff --git a/platform/core/src/utils/StackManager.js b/platform/core/src/utils/StackManager.js
index 49d8b0059..4b56fe58f 100644
--- a/platform/core/src/utils/StackManager.js
+++ b/platform/core/src/utils/StackManager.js
@@ -25,7 +25,7 @@ function createAndAddStack(stackMap, study, displaySet, stackUpdatedCallbacks) {
   const imageIds = [];
   let imageId;
 
-  displaySet.images.forEach((instance, imageIndex) => {
+  images.forEach((instance, imageIndex) => {
     const image = instance.getData();
     const metaData = {
       instance: image, // in this context, instance will be the data of the InstanceMetadata object...
@@ -35,7 +35,7 @@ function createAndAddStack(stackMap, study, displaySet, stackUpdatedCallbacks) {
       imageIndex: imageIndex + 1,
     };
 
-    const naturalizedInstance = instance.getData().metadata;
+    const naturalizedInstance = image.metadata;
     const NumberOfFrames = naturalizedInstance.NumberOfFrames;
 
     if (NumberOfFrames > 1) {