diff --git a/src/main/java/io/bitsquare/msg/P2PNode.java b/src/main/java/io/bitsquare/msg/P2PNode.java
index f6049cbe2a..d7f42bb4ff 100644
--- a/src/main/java/io/bitsquare/msg/P2PNode.java
+++ b/src/main/java/io/bitsquare/msg/P2PNode.java
@@ -363,7 +363,7 @@ public class P2PNode {
 
     private FuturePut storePeerAddress() throws IOException {
         Number160 locationKey = Utils.makeSHAHash(keyPair.getPublic().getEncoded());
-        Data data = new Data(peerDHT.peerAddress());
+        Data data = new Data(new TomP2PPeer(peerDHT.peerAddress()));
         log.debug("storePeerAddress " + peerDHT.peerAddress().toString());
         return putDomainProtectedData(locationKey, data);
     }
diff --git a/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java b/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
index daaecd5ba0..55a9555da3 100644
--- a/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
+++ b/src/main/java/io/bitsquare/network/tomp2p/TomP2PPeer.java
@@ -21,6 +21,8 @@ import io.bitsquare.network.Peer;
 
 import com.google.common.base.Objects;
 
+import java.io.Serializable;
+
 import net.tomp2p.peers.PeerAddress;
 
 /**
@@ -28,8 +30,10 @@ import net.tomp2p.peers.PeerAddress;
  *
  * @author Chris Beams
  */
-public class TomP2PPeer implements Peer {
+public class TomP2PPeer implements Peer, Serializable {
 
+    private static final long serialVersionUID = -2022551056208230853L;
+    
     private final PeerAddress peerAddress;
 
     public TomP2PPeer(PeerAddress peerAddress) {