diff --git a/module/screen/model.php b/module/screen/model.php
index 8b7f3cc861..4d24bf8b76 100644
--- a/module/screen/model.php
+++ b/module/screen/model.php
@@ -128,9 +128,11 @@ class screenModel extends model
             return $scheme;
         }
 
-        $scheme->componentList = $this->buildComponentList($scheme->componentList);
+        $chartData = new stdclass();
+        $chartData->editCanvasConfig = $this->config->screen->editCanvasConfig;
+        $chartData->componentList    = $this->buildComponentList($scheme);
 
-        return $scheme;
+        return $chartData;
     }
 
     /**