diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
index cbdfdbd4539..2011ad0d147 100644
--- a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
+++ b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts
@@ -116,7 +116,7 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
           minMax = uPlot.rangeNum(hardMinOnly ? hardMin : dataMin, hardMaxOnly ? hardMax : dataMax, rangeConfig);
         }
       } else if (scale.distr === 3) {
-        minMax = uPlot.rangeLog(dataMin!, dataMax!, logBase, true);
+        minMax = uPlot.rangeLog(hardMin ?? dataMin!, hardMax ?? dataMax!, logBase, true);
       }
 
       if (decimals === 0) {
@@ -154,13 +154,15 @@ export class UPlotScaleBuilder extends PlotConfigBuilder<ScaleProps, Scale> {
         }
       }
 
-      // if all we got were hard limits, treat them as static min/max
-      if (hardMinOnly) {
-        minMax[0] = hardMin!;
-      }
+      if (scale.distr === 1) {
+        // if all we got were hard limits, treat them as static min/max
+        if (hardMinOnly) {
+          minMax[0] = hardMin!;
+        }
 
-      if (hardMaxOnly) {
-        minMax[1] = hardMax!;
+        if (hardMaxOnly) {
+          minMax[1] = hardMax!;
+        }
       }
 
       // guard against invalid y ranges