diff --git a/src/main/java/bisq/network/p2p/network/Connection.java b/src/main/java/bisq/network/p2p/network/Connection.java
index 8fbd939..8daa6cd 100644
--- a/src/main/java/bisq/network/p2p/network/Connection.java
+++ b/src/main/java/bisq/network/p2p/network/Connection.java
@@ -36,6 +36,7 @@
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
 
+import bisq.common.Proto;
 import bisq.common.UserThread;
 import bisq.common.app.Capabilities;
 import bisq.common.app.Log;
@@ -279,32 +280,32 @@ public void sendMessage(NetworkEnvelope networkEnvelope) {
         }
     }
 
-    public boolean noCapabilityRequiredOrCapabilityIsSupported(NetworkEnvelope networkEnvelope) {
-        return !isCapabilityRequired(networkEnvelope) || isCapabilitySupported(networkEnvelope);
+    public boolean noCapabilityRequiredOrCapabilityIsSupported(Proto msg) {
+        return !isCapabilityRequired(msg) || isCapabilitySupported(msg);
     }
 
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    public static boolean isCapabilityRequired(NetworkEnvelope networkEnvelope) {
-        if (networkEnvelope instanceof AddDataMessage) {
-            final ProtectedStoragePayload protectedStoragePayload = (((AddDataMessage) networkEnvelope).getProtectedStorageEntry()).getProtectedStoragePayload();
+    public static boolean isCapabilityRequired(Proto msg) {
+        if (msg instanceof AddDataMessage) {
+            final ProtectedStoragePayload protectedStoragePayload = (((AddDataMessage) msg).getProtectedStorageEntry()).getProtectedStoragePayload();
             return protectedStoragePayload instanceof CapabilityRequiringPayload;
-        } else if (networkEnvelope instanceof AddPersistableNetworkPayloadMessage) {
-            final PersistableNetworkPayload persistableNetworkPayload = ((AddPersistableNetworkPayloadMessage) networkEnvelope).getPersistableNetworkPayload();
+        } else if (msg instanceof AddPersistableNetworkPayloadMessage) {
+            final PersistableNetworkPayload persistableNetworkPayload = ((AddPersistableNetworkPayloadMessage) msg).getPersistableNetworkPayload();
             return persistableNetworkPayload instanceof CapabilityRequiringPayload;
         } else {
-            return networkEnvelope instanceof CapabilityRequiringPayload;
+            return msg instanceof CapabilityRequiringPayload;
         }
     }
 
-    private boolean isCapabilitySupported(NetworkEnvelope networkEnvelope) {
-        if (networkEnvelope instanceof AddDataMessage) {
-            final ProtectedStoragePayload protectedStoragePayload = (((AddDataMessage) networkEnvelope).getProtectedStorageEntry()).getProtectedStoragePayload();
+    private boolean isCapabilitySupported(Proto msg) {
+        if (msg instanceof AddDataMessage) {
+            final ProtectedStoragePayload protectedStoragePayload = (((AddDataMessage) msg).getProtectedStorageEntry()).getProtectedStoragePayload();
             return protectedStoragePayload instanceof CapabilityRequiringPayload && isCapabilitySupported((CapabilityRequiringPayload) protectedStoragePayload);
-        } else if (networkEnvelope instanceof AddPersistableNetworkPayloadMessage) {
-            final PersistableNetworkPayload persistableNetworkPayload = ((AddPersistableNetworkPayloadMessage) networkEnvelope).getPersistableNetworkPayload();
+        } else if (msg instanceof AddPersistableNetworkPayloadMessage) {
+            final PersistableNetworkPayload persistableNetworkPayload = ((AddPersistableNetworkPayloadMessage) msg).getPersistableNetworkPayload();
             return persistableNetworkPayload instanceof CapabilityRequiringPayload && isCapabilitySupported((CapabilityRequiringPayload) persistableNetworkPayload);
         } else {
-            return networkEnvelope instanceof CapabilityRequiringPayload && isCapabilitySupported((CapabilityRequiringPayload) networkEnvelope);
+            return msg instanceof CapabilityRequiringPayload && isCapabilitySupported((CapabilityRequiringPayload) msg);
         }
     }
 
diff --git a/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java b/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
index 76b23b8..2ab9a0b 100644
--- a/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
+++ b/src/main/java/bisq/network/p2p/peers/getdata/GetDataRequestHandler.java
@@ -143,7 +143,7 @@ private Set<PersistableNetworkPayload> getFilteredPersistableNetworkPayload(GetD
         return dataStorage.getAppendOnlyDataStoreMap().entrySet().stream()
                 .filter(e -> !excludedKeysAsByteArray.contains(e.getKey()))
                 .map(Map.Entry::getValue)
-                .filter(payload -> (connection.noCapabilityRequiredOrCapabilityIsSupported(getDataRequest)))
+                .filter(payload -> (connection.noCapabilityRequiredOrCapabilityIsSupported(payload)))
                 .filter(payload -> tempLookupSet.add(new P2PDataStorage.ByteArray(payload.getHash())))
                 .collect(Collectors.toSet());
     }