diff --git a/ui/src/app/common/dashboard-utils.service.js b/ui/src/app/common/dashboard-utils.service.js
index 57919fba58..64a2c646cd 100644
--- a/ui/src/app/common/dashboard-utils.service.js
+++ b/ui/src/app/common/dashboard-utils.service.js
@@ -155,6 +155,10 @@ function DashboardUtils(types, utils, timeService) {
                 delete datasource.deviceAliasId;
             }
         });
+        //TODO: Temp workaround
+        if (widget.isSystemType  && widget.bundleAlias == 'charts' && widget.typeAlias == 'timeseries') {
+            widget.typeAlias = 'basic_timeseries';
+        }
         return widget;
     }
 
@@ -197,18 +201,22 @@ function DashboardUtils(types, utils, timeService) {
                 if (!widget.id) {
                     widget.id = utils.guid();
                 }
-                widgetsMap[widget.id] = validateAndUpdateWidget(widget);
+                widgetsMap[widget.id] = widget;
             });
             dashboard.configuration.widgets = widgetsMap;
         }
+        for (var id in dashboard.configuration.widgets) {
+            var widget = dashboard.configuration.widgets[id];
+            dashboard.configuration.widgets[id] = validateAndUpdateWidget(widget);
+        }
         if (angular.isUndefined(dashboard.configuration.states)) {
             dashboard.configuration.states = {
                 'default': createDefaultState(dashboard.title, true)
             };
 
             var mainLayout = dashboard.configuration.states['default'].layouts['main'];
-            for (var id in dashboard.configuration.widgets) {
-                var widget = dashboard.configuration.widgets[id];
+            for (id in dashboard.configuration.widgets) {
+                widget = dashboard.configuration.widgets[id];
                 mainLayout.widgets[id] = {
                     sizeX: widget.sizeX,
                     sizeY: widget.sizeY,
diff --git a/ui/src/app/widget/lib/flot-widget.js b/ui/src/app/widget/lib/flot-widget.js
index 3e03a38016..ff60bde407 100644
--- a/ui/src/app/widget/lib/flot-widget.js
+++ b/ui/src/app/widget/lib/flot-widget.js
@@ -193,7 +193,7 @@ export default class TbFlot {
             }
 
             ctx.yAxisTickFormatter = function(value/*, axis*/) {
-                if (settings.yaxis.showLabels === false) {
+                if (settings.yaxis && settings.yaxis.showLabels === false) {
                     return '';
                 }
                 var factor = this.tickDecimals ? Math.pow(10, this.tickDecimals) : 1,