diff --git a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java
index e97708167..6a3a7fad0 100644
--- a/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java
+++ b/chartfx-chart/src/main/java/io/fair_acc/chartfx/renderer/spi/AbstractRendererXY.java
@@ -122,6 +122,8 @@ protected void updateAxisRange(AxisRange range, int dim) {
     }
 
     protected void updateAxisRange(DataSet dataSet, AxisRange range, int dim) {
+        if (dataSet.getDataCount() == 0)
+            return;
         var dsRange = dataSet.getAxisDescription(dim);
         if (!dsRange.isDefined()) {
             dataSet.recomputeLimits(dim);