diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index 38d9c631b54..839dbba72e8 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -41,6 +41,7 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.timeSrv = $injector.get('timeSrv');
     this.templateSrv = $injector.get('templateSrv');
     this.scope = $scope;
+    this.panel.datasource = this.panel.datasource || null;
 
     if (!this.panel.targets) {
       this.panel.targets = [{}];
diff --git a/scripts/webpack/webpack.dev.js b/scripts/webpack/webpack.dev.js
index 51b9a646175..ab48864b8a0 100644
--- a/scripts/webpack/webpack.dev.js
+++ b/scripts/webpack/webpack.dev.js
@@ -45,8 +45,8 @@ module.exports = merge(common, {
       names: ['vendor', 'manifest'],
     }),
     new WebpackCleanupPlugin(),
-    new BundleAnalyzerPlugin({
-      analyzerPort: 8889
-    })
+    // new BundleAnalyzerPlugin({
+    //   analyzerPort: 8889
+    // })
   ]
 });