diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15dbd61..b275ecc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.7
+* Changed: Update `energy_forward` only if it was received
+* Changed: Fixed problems when timeout was set to `0`.
+
 ## v0.1.6
 * Changed: Allow to populate only L2 and/or L3 even if L1 is missing
 
diff --git a/dbus-mqtt-pv/dbus-mqtt-pv.py b/dbus-mqtt-pv/dbus-mqtt-pv.py
index 845fa45..270fa6e 100644
--- a/dbus-mqtt-pv/dbus-mqtt-pv.py
+++ b/dbus-mqtt-pv/dbus-mqtt-pv.py
@@ -226,7 +226,7 @@ def __init__(
         self._dbusservice.add_path('/ProductId', 0xFFFF)
         self._dbusservice.add_path('/ProductName', productname)
         self._dbusservice.add_path('/CustomName', customname)
-        self._dbusservice.add_path('/FirmwareVersion', '0.1.6 (20240226)')
+        self._dbusservice.add_path('/FirmwareVersion', '0.1.7 (20240702)')
         # self._dbusservice.add_path('/HardwareVersion', '')
         self._dbusservice.add_path('/Connected', 1)
 
@@ -370,7 +370,7 @@ def main():
             logging.warning("Waiting since %s seconds for receiving first data..." % str(i * 5))
 
         # 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