diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json
index d8dd362d0e8..e04e8067757 100644
--- a/packages/grafana-ui/package.json
+++ b/packages/grafana-ui/package.json
@@ -73,7 +73,7 @@
     "react-transition-group": "4.4.1",
     "slate": "0.47.8",
     "tinycolor2": "1.4.1",
-    "uplot": "1.6.15"
+    "uplot": "1.6.16"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "16.0.0",
diff --git a/public/app/plugins/panel/barchart/bars.ts b/public/app/plugins/panel/barchart/bars.ts
index 509e455db0d..257444bec29 100644
--- a/public/app/plugins/panel/barchart/bars.ts
+++ b/public/app/plugins/panel/barchart/bars.ts
@@ -234,6 +234,8 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
       }
     }
 
+    u.ctx.save();
+
     u.ctx.fillStyle = theme.colors.text.primary;
     u.ctx.font = `${fontSize}px ${theme.typography.fontFamily}`;
 
@@ -265,6 +267,8 @@ export function getConfig(opts: BarsOptions, theme: GrafanaTheme2) {
         );
       }
     });
+
+    u.ctx.restore();
   };
 
   // handle hover interaction with quadtree probing
diff --git a/yarn.lock b/yarn.lock
index c9b228ae184..c5356d1e3da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -23835,10 +23835,10 @@ update-notifier@^2.5.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
-uplot@1.6.15:
-  version "1.6.15"
-  resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.15.tgz#785ca9f66d9c28ec2fdfb7e623d627ea0dcb0dd5"
-  integrity sha512-6Fgq9tMaEM9Yu9oLkKd0w7VLJtV8LHG6dBrg1TmYi0LmSLkrj2Hqr11IrHk68cMaExnWAqay6YToQCrMZt1fcQ==
+uplot@1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.16.tgz#0c90c40dff52e9cbd7f24eb0d709c8cbf84be803"
+  integrity sha512-Rh0WtFgtZdYk70Knu1VyZYbwlx5GuoIFBezZuHwlEUiREsIjOKpe3CXLXLaKc7/49Z7XhQ/bazgF/f1zercxgw==
 
 upper-case@^1.1.1:
   version "1.1.3"