diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy
index 9e91078f..51aa1e19 100644
--- a/core/src/main/groovy/com/muwire/core/Core.groovy
+++ b/core/src/main/groovy/com/muwire/core/Core.groovy
@@ -233,8 +233,8 @@ public class Core {
             routerProps.setProperty("i2np.ntcp.port", i2pOptions["i2np.ntcp.port"])
             routerProps.setProperty("i2np.udp.port", i2pOptions["i2np.udp.port"])
             routerProps.setProperty("i2np.udp.internalPort", i2pOptions["i2np.udp.port"])
-            routerProps.setProperty("i2np.upnp.enable", i2pOptions["i2np.upnp.enable"])
-            routerProps.setProperty("i2np.upnp.ipv6.enable", i2pOptions["i2np.upnp.ipv6.enable"])
+            routerProps.setProperty("i2np.upnp.enable", i2pOptions.getProperty("i2np.upnp.enable","true"))
+            routerProps.setProperty("i2np.upnp.ipv6.enable", i2pOptions.getProperty("i2np.upnp.ipv6.enable","true"))
             router = new Router(routerProps)
             router.getContext().setLogManager(new MuWireLogManager())
             router.runRouter()