diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
index 933b76c8..a514a31a 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
@@ -587,9 +587,7 @@ public class ArbitraryDataFileListManager {
 
                             // Forward to requesting peer
                             LOGGER.debug("Forwarding file list with {} hashes to requesting peer: {}", hashes.size(), requestingPeer);
-                            if (!requestingPeer.sendMessage(forwardArbitraryDataFileListMessage)) {
-                                // requestingPeer.disconnect("failed to forward arbitrary data file list");
-                            }
+                            requestingPeer.sendMessage(forwardArbitraryDataFileListMessage);
                         }
                     }
                 }
@@ -787,7 +785,6 @@ public class ArbitraryDataFileListManager {
 
                     if (!peer.sendMessage(arbitraryDataFileListMessage)) {
                         LOGGER.debug("Couldn't send list of hashes");
-                        // peer.disconnect("failed to send list of hashes");
                         continue;
                     }
 
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
index 24cec145..0376272c 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
@@ -410,15 +410,7 @@ public void queueFileSendToPeer(Peer peer, Message fileMessage) {
             // The ID needs to match that of the original request
             message.setId(originalMessage.getId());
 
-            // if (!requestingPeer.sendMessageWithTimeout(message, (int) ArbitraryDataManager.ARBITRARY_REQUEST_TIMEOUT)) {
-            //     LOGGER.info("Failed to forward arbitrary data file to peer {}", requestingPeer);
-            //     requestingPeer.disconnect("failed to forward arbitrary data file");
-            // }
-
-            // else {
-            //     LOGGER.info("Forwarded arbitrary data file to peer {}", requestingPeer);
-            // }
-                                        getOrCreateSendManager(requestingPeer).queueMessage(message);
+            getOrCreateSendManager(requestingPeer).queueMessage(message);
 
         } catch (Exception e) {
             LOGGER.error(e.getMessage(), e);
@@ -695,13 +687,7 @@ public void queueFileSendToPeer(Peer peer, Message fileMessage) {
                 LOGGER.debug("Sending file {}...", arbitraryDataFile);
                 ArbitraryDataFileMessage arbitraryDataFileMessage = new ArbitraryDataFileMessage(signature, arbitraryDataFile);
                 arbitraryDataFileMessage.setId(message.getId());
-                // if (!peer.sendMessageWithTimeout(arbitraryDataFileMessage, (int) ArbitraryDataManager.ARBITRARY_REQUEST_TIMEOUT)) {
-                //     LOGGER.info("Couldn't send file {}", arbitraryDataFile);
-                //     // peer.disconnect("failed to send file");
-                // }
-                // else {
-                //     LOGGER.debug("Sent file {}", arbitraryDataFile);
-                // }
+
                 getOrCreateSendManager(peer).queueMessage(arbitraryDataFileMessage);
 
             }
@@ -737,7 +723,6 @@ public void queueFileSendToPeer(Peer peer, Message fileMessage) {
                 fileUnknownMessage.setId(message.getId());
                 if (!peer.sendMessage(fileUnknownMessage)) {
                     LOGGER.debug("Couldn't sent file-unknown response");
-                    // peer.disconnect("failed to send file-unknown response");
                 }
                 else {
                     LOGGER.debug("Sent file-unknown response for file {}", arbitraryDataFile);
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryMetadataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryMetadataManager.java
index 87175585..76e44895 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryMetadataManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryMetadataManager.java
@@ -360,9 +360,8 @@ public class ArbitraryMetadataManager {
 
                         // Forward to requesting peer
                         LOGGER.debug("Forwarding metadata to requesting peer: {}", requestingPeer);
-                        if (!requestingPeer.sendMessage(forwardArbitraryMetadataMessage)) {
-                            // requestingPeer.disconnect("failed to forward arbitrary metadata");
-                        }
+                        requestingPeer.sendMessage(forwardArbitraryMetadataMessage);
+                       
                     }
                 }
             }
@@ -479,7 +478,6 @@ public class ArbitraryMetadataManager {
                                 arbitraryMetadataMessage.setId(message.getId());
                                 if (!peer.sendMessage(arbitraryMetadataMessage)) {
                                     LOGGER.debug("Couldn't send metadata");
-                                    // peer.disconnect("failed to send metadata");
                                     continue;
                                 }
                                 LOGGER.debug("Sent metadata");