diff --git a/CHANGELOG.md b/CHANGELOG.md
index c391d82..db8e5fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v1.0.2
+* Changed: Fixed problems when timeout was set to `0`.
+
 ## v1.0.1
 * Added: Timeout on driver startup. Prevents problems, if the MQTT broker is not reachable on driver startup
 
diff --git a/dbus-mqtt-solar-charger/dbus-mqtt-solar-charger.py b/dbus-mqtt-solar-charger/dbus-mqtt-solar-charger.py
index 9219ba2..fcab3b1 100644
--- a/dbus-mqtt-solar-charger/dbus-mqtt-solar-charger.py
+++ b/dbus-mqtt-solar-charger/dbus-mqtt-solar-charger.py
@@ -460,7 +460,7 @@ def __init__(
         self._dbusservice.add_path("/ProductName", productname)
         self._dbusservice.add_path("/CustomName", customname)
         self._dbusservice.add_path("/FirmwareVersion", 399)
-        self._dbusservice.add_path("/HardwareVersion", "1.0.1 (20231218)")
+        self._dbusservice.add_path("/HardwareVersion", "1.0.2 (20240702)")
         self._dbusservice.add_path("/Connected", 1)
 
         self._dbusservice.add_path("/Latency", None)
@@ -612,7 +612,7 @@ def main():
             )
 
         # check if timeout was exceeded
-        if timeout <= (i * 5):
+        if timeout != 0 and timeout <= (i * 5):
             logging.error(
                 "Driver stopped. Timeout of %i seconds exceeded, since no new MQTT message was received in this time."
                 % timeout