diff --git a/LesionTracker/client/components/app/app.js b/LesionTracker/client/components/app/app.js
index a51185ae4..88c5fd64d 100644
--- a/LesionTracker/client/components/app/app.js
+++ b/LesionTracker/client/components/app/app.js
@@ -44,9 +44,6 @@ Template.app.onCreated(() => {
         const routeName = currentRoute.route.getName();
         const isViewer = routeName.indexOf('viewer') === 0;
 
-        // Define the OHIF.viewer.data global object
-        OHIF.viewer.data = OHIF.viewer.data || Session.get('ViewerData') || {};
-
         // Add or remove the strech class from body
         $(document.body)[isViewer ? 'addClass' : 'removeClass']('stretch');
 
diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index d5d3c7200..dc57ecf4b 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -35,6 +35,9 @@ Template.viewer.onCreated(() => {
 
     const instance = Template.instance();
 
+    // Define the OHIF.viewer.data global object
+    OHIF.viewer.data = OHIF.viewer.data || Session.get('ViewerData') || {};
+
     const { TimepointApi, MeasurementApi, ConformanceCriteria } = OHIF.measurements;
 
     const currentTimepointId = OHIF.viewer.data.currentTimepointId;
diff --git a/OHIFViewer/client/components/ohifViewer/ohifViewer.js b/OHIFViewer/client/components/ohifViewer/ohifViewer.js
index 98295fd88..b3f040737 100644
--- a/OHIFViewer/client/components/ohifViewer/ohifViewer.js
+++ b/OHIFViewer/client/components/ohifViewer/ohifViewer.js
@@ -8,9 +8,6 @@ Template.ohifViewer.onCreated(() => {
     const instance = Template.instance();
     instance.headerClasses = new ReactiveVar('');
 
-    // Define the OHIF.viewer.data global object
-    OHIF.viewer.data = instance.data.viewerData || {};
-
     OHIF.header.dropdown.setItems([{
         action: () => OHIF.ui.showDialog('serverInformationModal'),
         text: 'Server Information',
diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index 0c7202ac2..f16258703 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -80,6 +80,9 @@ Template.viewer.onCreated(() => {
 
     const instance = Template.instance();
 
+    // Define the OHIF.viewer.data global object
+    OHIF.viewer.data = OHIF.viewer.data || Session.get('ViewerData') || {};
+
     instance.data.state = new ReactiveDict();
     instance.data.state.set('leftSidebar', Session.get('leftSidebar'));
     instance.data.state.set('rightSidebar', Session.get('rightSidebar'));
@@ -99,6 +102,9 @@ Template.viewer.onCreated(() => {
         OHIF.viewer.data.activeViewport = 0;
     }
 
+    // Store the viewer data in session for further user
+    Session.setPersistent('ViewerData', OHIF.viewer.data);
+
     Session.set('activeViewport', OHIF.viewer.data.activeViewport || 0);
 
     // @TypeSafeStudies