diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index f0751ddd816..a6c80d6e03a 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -229,7 +229,7 @@ class GraphCtrl extends MetricsPanelCtrl {
     for (const series of this.seriesList) {
       series.applySeriesOverrides(this.panel.seriesOverrides);
 
-      if (series.unit) {
+      if (this.panel.yaxes[series.yaxis - 1].format === 'none' && series.unit) {
         this.panel.yaxes[series.yaxis - 1].format = series.unit;
       }
     }