diff --git a/transporthandler.cpp b/transporthandler.cpp
index 61960d2..a533e8c 100644
--- a/transporthandler.cpp
+++ b/transporthandler.cpp
@@ -389,7 +389,8 @@
         deleteObjectIfExists(bus, params.service, ifaddr->path);
     }
 
-    if (struct in_addr nullIPv4{0}; address.value().s_addr != nullIPv4.s_addr)
+    if (struct in_addr nullIPv4{0};
+        (address == std::nullopt || address.value().s_addr != nullIPv4.s_addr))
     {
         createIfAddr<AF_INET>(bus, params, address.value_or(ifaddr->address),
                               prefix.value_or(fallbackPrefix));