diff --git a/src/init.cpp b/src/init.cpp
index 191daa4..cc84e6c 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -866,7 +866,7 @@ bool AppInit2(boost::thread_group& threadGroup)
 
     // see Step 2: parameter interactions for more information about these
     fNoListen = !GetBoolArg("-listen", true);
-    fDiscover = true; //GetBoolArg("-discover", true); TODO
+    fDiscover = GetBoolArg("-discover", true); 
     fNameLookup = GetBoolArg("-dns", true);
 
     // -i2p can override both tor and proxy
diff --git a/src/net.cpp b/src/net.cpp
index c51a46a..07e54a3 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1858,7 +1858,7 @@ bool BindListenNativeI2P(SOCKET& hSocket)
     if (!SetSocketOptions(hSocket) || hSocket == INVALID_SOCKET)
         return false;
     CService addrBind(I2PSession::Instance().getMyDestination().pub, 0);
-    if (addrBind.IsRoutable() && fDiscover)
+    if (addrBind.IsRoutable())
         AddLocal(addrBind, LOCAL_BIND);
     return true;
 }