diff --git a/modules/default/weather/forecast.njk b/modules/default/weather/forecast.njk
index bd223101..7d0f515d 100644
--- a/modules/default/weather/forecast.njk
+++ b/modules/default/weather/forecast.njk
@@ -1,8 +1,10 @@
 {% if forecast or weatherData %}
     {% if weatherData %}
         {% set forecast = weatherData.days %}
+        {% set numSteps = forecast | calcNumEntries %}
+    {% else %}
+        {% set numSteps = forecast | calcNumSteps %}
     {% endif %}
-    {% set numSteps = forecast | calcNumSteps %}
     {% set currentStep = 0 %}
     <table class="{{ config.tableClass }}">
         {% set forecast = forecast.slice(0, numSteps) %}