diff --git a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
index 80d0626739..8a5c0b617c 100644
--- a/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
+++ b/ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp
@@ -674,11 +674,15 @@ void RiuQtChartsPlotWidget::setAxisAutoScale( RiuPlotAxis axis, bool autoScale )
     if ( autoScale )
     {
         rescaleAxis( axis );
+
         QAbstractAxis* ax        = plotAxis( axis );
         QValueAxis*    valueAxis = dynamic_cast<QValueAxis*>( ax );
         if ( valueAxis )
         {
+            // Block signals to avoid triggering RimSummaryPlot::onPlotZoomed
+            valueAxis->blockSignals( true );
             valueAxis->applyNiceNumbers();
+            valueAxis->blockSignals( false );
         }
     }
 }
@@ -688,7 +692,14 @@ void RiuQtChartsPlotWidget::setAxisAutoScale( RiuPlotAxis axis, bool autoScale )
 //--------------------------------------------------------------------------------------------------
 void RiuQtChartsPlotWidget::setAxisScale( RiuPlotAxis axis, double min, double max )
 {
-    plotAxis( axis )->setRange( min, max );
+    if ( axisScaleType( axis ) == RiuPlotWidget::AxisScaleType::DATE )
+    {
+        plotAxis( axis )->setRange( QDateTime::fromMSecsSinceEpoch( min ), QDateTime::fromMSecsSinceEpoch( max ) );
+    }
+    else
+    {
+        plotAxis( axis )->setRange( min, max );
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -974,6 +985,9 @@ void RiuQtChartsPlotWidget::rescaleAxis( RiuPlotAxis axis )
         }
     }
 
+    // Block signals to avoid triggering RimSummaryPlot::onPlotZoomed
+    pAxis->blockSignals( true );
+
     if ( axisScaleType( axis ) == RiuPlotWidget::AxisScaleType::DATE )
     {
         pAxis->setRange( QDateTime::fromMSecsSinceEpoch( min ), QDateTime::fromMSecsSinceEpoch( max ) );
@@ -982,6 +996,8 @@ void RiuQtChartsPlotWidget::rescaleAxis( RiuPlotAxis axis )
     {
         pAxis->setRange( min, max );
     }
+
+    pAxis->blockSignals( false );
 }
 
 //--------------------------------------------------------------------------------------------------