diff --git a/custom_components/smart_irrigation/__init__.py b/custom_components/smart_irrigation/__init__.py
index 55ff845c..33ad7c49 100644
--- a/custom_components/smart_irrigation/__init__.py
+++ b/custom_components/smart_irrigation/__init__.py
@@ -947,19 +947,21 @@ def calculate_module(self, zone, weatherdata, forecastdata):
                     "module.calculation.explanation.duration-after-maximum-duration-is",
                     self.hass.config.language,
                 ) + " {}</li>".format(round(duration))
-            duration = round(zone.get(const.ZONE_LEAD_TIME) + duration)
-            explanation += (
-                "<li>"
-                + localize(
-                    "module.calculation.explanation.lead-time-is-applied",
-                    self.hass.config.language,
+            # add the lead time but only if duration is > 0 at this point
+            if duration > 0.0:
+                duration = round(zone.get(const.ZONE_LEAD_TIME) + duration)
+                explanation += (
+                    "<li>"
+                    + localize(
+                        "module.calculation.explanation.lead-time-is-applied",
+                        self.hass.config.language,
+                    )
+                    + " {}, ".format(zone.get(const.ZONE_LEAD_TIME))
                 )
-                + " {}, ".format(zone.get(const.ZONE_LEAD_TIME))
-            )
-            explanation += localize(
-                "module.calculation.explanation.duration-after-lead-time-is",
-                self.hass.config.language,
-            ) + " {}</li></ol>".format(duration)
+                explanation += localize(
+                    "module.calculation.explanation.duration-after-lead-time-is",
+                    self.hass.config.language,
+                ) + " {}</li></ol>".format(duration)
         else:
             # no need to irrigate, set duration to 0
             duration = 0
@@ -1312,6 +1314,7 @@ async def async_update_zone_config(self, zone_id: int = None, data: dict = {}):
                 new_bucket_value = res[const.ZONE_MAXIMUM_BUCKET]
             data[const.ZONE_BUCKET] = new_bucket_value
             data.pop(const.ATTR_SET_BUCKET)
+
             self.store.async_update_zone(zone_id, data)
             async_dispatcher_send(self.hass, const.DOMAIN + "_config_updated", zone_id)
         elif const.ATTR_RESET_ALL_BUCKETS in data:
diff --git a/custom_components/smart_irrigation/const.py b/custom_components/smart_irrigation/const.py
index f8d54d88..e2311f26 100644
--- a/custom_components/smart_irrigation/const.py
+++ b/custom_components/smart_irrigation/const.py
@@ -1,7 +1,7 @@
 """Store constants."""
 
 
-VERSION = "v2024.4.3"
+VERSION = "v2024.4.4"
 NAME = "Smart Irrigation"
 MANUFACTURER = "@jeroenterheerdt"
 
diff --git a/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js b/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js
index c0e5e552..83247d0b 100644
--- a/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js
+++ b/custom_components/smart_irrigation/frontend/dist/smart-irrigation.js
@@ -1057,7 +1057,7 @@ a.version="2.29.4",i(Wa),a.fn=us,a.min=Xa,a.max=Ja,a.now=Qa,a.utc=p,a.unix=cs,a.
             .narrow=${this.narrow}
           ></ha-menu-button>
           <div class="main-title">${hi("title",this.hass.language)}</div>
-          <div class="version">${"v2024.4.3"}</div>
+          <div class="version">${"v2024.4.4"}</div>
         </div>
 
         <ha-tabs
diff --git a/custom_components/smart_irrigation/frontend/src/const.ts b/custom_components/smart_irrigation/frontend/src/const.ts
index faaeb7a1..aca8d196 100644
--- a/custom_components/smart_irrigation/frontend/src/const.ts
+++ b/custom_components/smart_irrigation/frontend/src/const.ts
@@ -1,4 +1,4 @@
-export const VERSION = "v2024.4.3";
+export const VERSION = "v2024.4.4";
 export const REPO = "https://github.com/jeroenterheerdt/HASmartIrrigation;";
 export const ISSUES_URL = REPO + "/issues";
 
diff --git a/custom_components/smart_irrigation/manifest.json b/custom_components/smart_irrigation/manifest.json
index 3d276bc5..863bbaab 100644
--- a/custom_components/smart_irrigation/manifest.json
+++ b/custom_components/smart_irrigation/manifest.json
@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/jeroenterheerdt/HASmartIrrigation/issues",
   "requirements": [],
-  "version": "v2024.4.3"
+  "version": "v2024.4.4"
 }
diff --git a/custom_components/smart_irrigation/store.py b/custom_components/smart_irrigation/store.py
index 2fe1c1d4..44f4b845 100644
--- a/custom_components/smart_irrigation/store.py
+++ b/custom_components/smart_irrigation/store.py
@@ -510,6 +510,7 @@ def async_update_zone(self, zone_id: int, changes: dict) -> ZoneEntry:
             # apply maximum bucket value
             if (
                 ZONE_MAXIMUM_BUCKET in changes
+                and changes[ZONE_BUCKET] is not None
                 and changes[ZONE_BUCKET] > changes[ZONE_MAXIMUM_BUCKET]
             ):
                 changes[ZONE_BUCKET] = changes[ZONE_MAXIMUM_BUCKET]