diff --git a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java
index 4f7502e937..e0c0d6622f 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/BootstrappedPeerFactory.java
@@ -77,6 +77,7 @@ class BootstrappedPeerFactory {
 
     static final String BOOTSTRAP_NODE_KEY = "bootstrapNode";
     static final String NETWORK_INTERFACE_KEY = "networkInterface";
+    static final String NETWORK_INTERFACE_UNSPECIFIED = "<unspecified>";
 
     private KeyPair keyPair;
     private Storage storage;
@@ -132,7 +133,7 @@ class BootstrappedPeerFactory {
             cc.maxPermitsTCP(100);
             cc.maxPermitsUDP(100);
             Bindings bindings = new Bindings();
-            if (!networkInterface.equals(""))
+            if (!NETWORK_INTERFACE_UNSPECIFIED.equals(networkInterface))
                 bindings.addInterface(networkInterface);
 
             peer = new PeerBuilder(keyPair).ports(port).peerMap(pm).bindings(bindings)
diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
index 9f70bb983c..dcdcb112bd 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java
@@ -25,7 +25,7 @@ import com.google.inject.name.Names;
 
 import java.util.Properties;
 
-import static io.bitsquare.msg.tomp2p.BootstrappedPeerFactory.BOOTSTRAP_NODE_KEY;
+import static io.bitsquare.msg.tomp2p.BootstrappedPeerFactory.*;
 import static io.bitsquare.network.BootstrapNodes.DEFAULT_BOOTSTRAP_NODE;
 
 public class TomP2PMessageModule extends MessageModule {
@@ -52,7 +52,7 @@ public class TomP2PMessageModule extends MessageModule {
                 )
         );
         bindConstant().annotatedWith(Names.named(NETWORK_INTERFACE_KEY)).to(
-                properties.getProperty(NETWORK_INTERFACE_KEY, ""));
+                properties.getProperty(NETWORK_INTERFACE_KEY, NETWORK_INTERFACE_UNSPECIFIED));
         bind(BootstrappedPeerFactory.class).asEagerSingleton();
     }