diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
index e968d64c..802a2b15 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
@@ -395,7 +395,7 @@ public class ArbitraryDataManager extends Thread {
 		List<byte[]> signatures = arbitrarySignaturesMessage.getSignatures();
 
 		String peerAddress = peer.getPeerData().getAddress().toString();
-		if (arbitrarySignaturesMessage.getPeerAddress() != null) {
+		if (arbitrarySignaturesMessage.getPeerAddress() != null && !arbitrarySignaturesMessage.getPeerAddress().isEmpty()) {
 			// This message is about a different peer than the one that sent it
 			peerAddress = arbitrarySignaturesMessage.getPeerAddress();
 		}
diff --git a/src/main/java/org/qortal/network/Network.java b/src/main/java/org/qortal/network/Network.java
index 345b275f..284149e3 100644
--- a/src/main/java/org/qortal/network/Network.java
+++ b/src/main/java/org/qortal/network/Network.java
@@ -1109,7 +1109,7 @@ public class Network {
     // External IP / peerAddress tracking
 
     public void ourPeerAddressUpdated(String peerAddress) {
-        if (peerAddress == null) {
+        if (peerAddress == null || peerAddress.isEmpty()) {
             return;
         }