diff --git a/extensions/ohif-cornerstone-extension/package.json b/extensions/ohif-cornerstone-extension/package.json
index 0832e1384..d7899dc2a 100644
--- a/extensions/ohif-cornerstone-extension/package.json
+++ b/extensions/ohif-cornerstone-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ohif-cornerstone-extension",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "OHIF extension for Cornerstone",
   "author": "OHIF",
   "license": "MIT",
@@ -39,7 +39,7 @@
     "@babel/runtime": "^7.2.0",
     "classnames": "^2.2.6",
     "lodash.throttle": "^4.1.1",
-    "react-cornerstone-viewport": "0.1.28"
+    "react-cornerstone-viewport": "0.1.29"
   },
   "devDependencies": {
     "@babel/core": "^7.2.2",
diff --git a/extensions/ohif-cornerstone-extension/yarn.lock b/extensions/ohif-cornerstone-extension/yarn.lock
index 73cc6b4a1..dc87970cf 100644
--- a/extensions/ohif-cornerstone-extension/yarn.lock
+++ b/extensions/ohif-cornerstone-extension/yarn.lock
@@ -4418,10 +4418,10 @@ randomfill@^1.0.3:
     randombytes "^2.0.5"
     safe-buffer "^5.1.0"
 
-react-cornerstone-viewport@0.1.28:
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.28.tgz#ca1b0062c9f08868c653c11d6cdef8f5d519f90a"
-  integrity sha512-lGXFB1pxUJE+tozAHjQD8KcmnGuGG/nD3CGrK44cFqx8e3W/CKU9/bZM6qomy/X1fK5TlnJUaZ9NOCaDLhzJrQ==
+react-cornerstone-viewport@0.1.29:
+  version "0.1.29"
+  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.29.tgz#7ef3c2f3d7dc45339b14c17a53e05db367a28394"
+  integrity sha512-KUjdqjti53v4eNyFTT3tXJ4cTyb64eMW3QF1cQqd+1+Re8UXSF1+k9uku15vR/Qt/YOv9Bsh74PabBct7BxWog==
   dependencies:
     lodash.debounce "^4.0.8"
     moment "^2.23.0"
diff --git a/package.json b/package.json
index 6e5bd1860..29e775d09 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "lodash.isequal": "4.5.0",
     "moment": "^2.24.0",
     "ohif-core": "0.5.5",
-    "ohif-cornerstone-extension": "0.0.31",
+    "ohif-cornerstone-extension": "0.0.32",
     "ohif-dicom-html-extension": "^0.0.2",
     "ohif-dicom-microscopy-extension": "^0.0.5",
     "ohif-dicom-pdf-extension": "^0.0.6",
diff --git a/src/connectedComponents/ViewerMain.js b/src/connectedComponents/ViewerMain.js
index 8c4b2478a..57f60cac2 100644
--- a/src/connectedComponents/ViewerMain.js
+++ b/src/connectedComponents/ViewerMain.js
@@ -28,6 +28,8 @@ class ViewerMain extends Component {
     this.state = {
       displaySets: [],
     }
+
+    this.cachedViewportData = {}
   }
 
   getDisplaySets(studies) {
@@ -81,8 +83,25 @@ class ViewerMain extends Component {
     ) {
       let displaySet = viewportSpecificData[viewportIndex]
 
-      // If the viewport is empty, get one available in study
-      if (!displaySet || !displaySet.displaySetInstanceUid) {
+      // Use the cached display set in viewport if the new one is empty
+      if (displaySet && !displaySet.displaySetInstanceUid) {
+        displaySet = this.cachedViewportData[viewportIndex]
+      }
+
+      if (
+        displaySet &&
+        displaySet.studyInstanceUid &&
+        displaySet.displaySetInstanceUid
+      ) {
+        // Get missing fields from original display set
+        const originalDisplaySet = this.findDisplaySet(
+          this.props.studies,
+          displaySet.studyInstanceUid,
+          displaySet.displaySetInstanceUid
+        )
+        viewportData.push(Object.assign({}, originalDisplaySet, displaySet))
+      } else {
+        // If the viewport is empty, get one available in study
         const { displaySets } = this.state
         displaySet = displaySets.find(
           ds =>
@@ -90,11 +109,12 @@ class ViewerMain extends Component {
               v => v.displaySetInstanceUid === ds.displaySetInstanceUid
             )
         )
+        viewportData.push(Object.assign({}, displaySet))
       }
-
-      viewportData.push(displaySet)
     }
 
+    this.cachedViewportData = viewportData
+
     return viewportData
   }
 
diff --git a/yarn.lock b/yarn.lock
index 78f611c75..7b88a30c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9688,15 +9688,15 @@ ohif-core@0.5.5:
     lodash.merge "^4.6.1"
     validate.js "^0.12.0"
 
-ohif-cornerstone-extension@0.0.31:
-  version "0.0.31"
-  resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.31.tgz#39669e5d8a5e39a4e84f0bdae02b39e222c222aa"
-  integrity sha512-7skySEBTkQ2cVOvHXI1Q4rPsjynD1xQ9xQTnPskNNvMEiH4/XJbBXsmbg37D3hocXL16CKIztHoYpNqF0cruYQ==
+ohif-cornerstone-extension@0.0.32:
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/ohif-cornerstone-extension/-/ohif-cornerstone-extension-0.0.32.tgz#607852e2e300b320e29a37f0f8c9ced3cf4b07e5"
+  integrity sha512-qHpYno6pYT3UqqAVd+SsMvwIei2sPRxkasqt8uxDSA+tbsM/TaY8daICMknC5aRGvr5XrY9+gSztE6GPJbX0Og==
   dependencies:
     "@babel/runtime" "^7.2.0"
     classnames "^2.2.6"
     lodash.throttle "^4.1.1"
-    react-cornerstone-viewport "0.1.28"
+    react-cornerstone-viewport "0.1.29"
 
 ohif-dicom-html-extension@^0.0.2:
   version "0.0.2"
@@ -11480,10 +11480,10 @@ react-bootstrap-modal@4.2.0, react-bootstrap-modal@^4.2.0:
     react-overlays "^0.8.0"
     react-transition-group "^2.0.0"
 
-react-cornerstone-viewport@0.1.28:
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.28.tgz#ca1b0062c9f08868c653c11d6cdef8f5d519f90a"
-  integrity sha512-lGXFB1pxUJE+tozAHjQD8KcmnGuGG/nD3CGrK44cFqx8e3W/CKU9/bZM6qomy/X1fK5TlnJUaZ9NOCaDLhzJrQ==
+react-cornerstone-viewport@0.1.29:
+  version "0.1.29"
+  resolved "https://registry.yarnpkg.com/react-cornerstone-viewport/-/react-cornerstone-viewport-0.1.29.tgz#7ef3c2f3d7dc45339b14c17a53e05db367a28394"
+  integrity sha512-KUjdqjti53v4eNyFTT3tXJ4cTyb64eMW3QF1cQqd+1+Re8UXSF1+k9uku15vR/Qt/YOv9Bsh74PabBct7BxWog==
   dependencies:
     lodash.debounce "^4.0.8"
     moment "^2.23.0"