diff --git a/Packages/viewerbase/lib/helpers/isDisplaySetActive.js b/Packages/viewerbase/lib/helpers/isDisplaySetActive.js
index 6fee1bc61..251e0ecc6 100644
--- a/Packages/viewerbase/lib/helpers/isDisplaySetActive.js
+++ b/Packages/viewerbase/lib/helpers/isDisplaySetActive.js
@@ -10,7 +10,6 @@ Template.registerHelper('isDisplaySetActive', (displaySetInstanceUid, viewportIn
         return;
     }
 
-    console.warn('>>>>test');
     let viewportData;
     if (_.isUndefined(viewportIndex)) {
         viewportData = layoutManager.viewportData;
diff --git a/Packages/viewerbase/lib/layoutManager.js b/Packages/viewerbase/lib/layoutManager.js
index 0877a56b9..ec2acf755 100644
--- a/Packages/viewerbase/lib/layoutManager.js
+++ b/Packages/viewerbase/lib/layoutManager.js
@@ -21,6 +21,10 @@ LayoutManager = class LayoutManager {
         return this.layoutProps.rows * this.layoutProps.columns;
     }
 
+    updateSession() {
+        Tracker.afterFlush(() => Session.set('LayoutManagerUpdated', Random.id()));
+    }
+
     setDefaultViewportData() {
         var numViewports = this.getNumberOfViewports();
 
@@ -109,7 +113,7 @@ LayoutManager = class LayoutManager {
         $(this.parentNode).html('');
         Blaze.renderWithData(layoutTemplate, data, this.parentNode);
 
-        Session.set('LayoutManagerUpdated', Random.id());
+        this.updateSession();
 
         this.isZoomed = false;
     }
@@ -157,7 +161,7 @@ LayoutManager = class LayoutManager {
         // Render and insert the template
         Blaze.renderWithData(Template.imageViewerViewport, data, newViewportContainer);
 
-        Session.set('LayoutManagerUpdated', Random.id());
+        this.updateSession();
     }
 
     enlargeViewport(viewportIndex) {
@@ -191,7 +195,7 @@ LayoutManager = class LayoutManager {
         this.zoomedViewportIndex = viewportIndex;
         this.viewportData = data.viewportData;
 
-        Session.set('LayoutManagerUpdated', Random.id());
+        this.updateSession();
     }
 
     resetPreviousLayout() {