diff --git a/Spaces/ChartingSpace.js b/Spaces/ChartingSpace.js
index 05da2131e..cb82c62ba 100644
--- a/Spaces/ChartingSpace.js
+++ b/Spaces/ChartingSpace.js
@@ -77,8 +77,10 @@ function newChartingSpace () {
     thisObject.container.finalize()
     thisObject.container = undefined
 
-    thisObject.viewport.finalize()
-    thisObject.viewport = undefined
+    if (thisObject.viewport !== undefined) {
+      thisObject.viewport.finalize()
+      thisObject.viewport = undefined
+    }
 
     thisObject.payload = undefined
   }