diff --git a/ChartsSpace/PlottersManager.js b/ChartsSpace/PlottersManager.js
index 3f72c0df5..46cdccd33 100644
--- a/ChartsSpace/PlottersManager.js
+++ b/ChartsSpace/PlottersManager.js
@@ -12,6 +12,7 @@ function newPlottersManager () {
   let thisObject = {
     fitFunction: undefined,
     container: undefined,
+    payload: undefined,
     setDatetime: setDatetime,
     setTimeFrame: setTimeFrame,
     positionAtDatetime: positionAtDatetime,
@@ -66,7 +67,8 @@ function newPlottersManager () {
 
     thisObject.container.finalize()
     thisObject.container = undefined
-    setupContainer()
+
+    thisObject.payload = undefined
   }
 
   function finalizeStorage (storage) {
@@ -204,7 +206,7 @@ function newPlottersManager () {
                       isLegacy: panel.code.isLegacy
                     }
 
-                    let owner = thisObject.payload.node.payload.parentNode.payload.parentNode.id // Panels are owned by the time machine.
+                    let owner = thisObject.payload.node.payload.parentNode.id // Panels are owned by the time machine.
                     let plotterPanelHandle = canvas.panelsSpace.createNewPanel('Plotter Panel', parameters, owner, layer.session)
                     let plotterPanel = canvas.panelsSpace.getPanel(plotterPanelHandle)
 
diff --git a/ChartsSpace/TimelineChart.js b/ChartsSpace/TimelineChart.js
index 1dc3e7309..b29c67a14 100644
--- a/ChartsSpace/TimelineChart.js
+++ b/ChartsSpace/TimelineChart.js
@@ -155,6 +155,7 @@ function newTimelineChart () {
     thisObject.plotterManager.container.frame.position.y = 0
 
     thisObject.plotterManager.fitFunction = thisObject.fitFunction
+    thisObject.plotterManager.payload = thisObject.payload
     thisObject.plotterManager.initialize(thisObject.layersManager, DEFAULT_EXCHANGE, DEFAULT_MARKET)
     thisObject.plotterManager.setTimeFrame(timeFrame)
   }