diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
index ab9b722cc1f..839935cd1e5 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotConfigBuilder.ts
@@ -269,7 +269,10 @@ export class UPlotConfigBuilder {
     const xAxis = axes.find((a) => a.props.scaleKey === 'x');
     const axesWithoutGridSet = axes.filter((a) => a.props.grid?.show === undefined);
     const firstValueAxisIdx = axesWithoutGridSet.findIndex(
-      (a) => a.props.placement === AxisPlacement.Left || (a.props.placement === AxisPlacement.Bottom && a !== xAxis)
+      (a) =>
+        a.props.placement === AxisPlacement.Left ||
+        a.props.placement === AxisPlacement.Right ||
+        (a.props.placement === AxisPlacement.Bottom && a !== xAxis)
     );
 
     // For all axes with no grid set, set the grid automatically (grid only for first left axis )