diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1696,6 +1696,15 @@
             return error("message addr size() = %u", vAddr.size());
         }
 
+        // Don't want addr from non-Cash peers if we're on the Cash chain
+        // already
+        if (!(pfrom->nServices & NODE_BITCOIN_CASH)) {
+            LOCK(cs_main);
+            if (IsUAHFenabledForCurrentBlock(config)) {
+                return true;
+            }
+        }
+
         // Store the new addresses
         std::vector<CAddress> vAddrOk;
         int64_t nNow = GetAdjustedTime();