diff --git a/core/src/main/java/bisq/core/dao/node/BsqNode.java b/core/src/main/java/bisq/core/dao/node/BsqNode.java
index 037f7b3b7f1..2e0bdfef4d4 100644
--- a/core/src/main/java/bisq/core/dao/node/BsqNode.java
+++ b/core/src/main/java/bisq/core/dao/node/BsqNode.java
@@ -230,8 +230,7 @@ protected Optional<Block> doParseBlock(RawBlock rawBlock) throws RequiredReorgFr
         try {
             Block block = blockParser.parseBlock(rawBlock);
 
-            if (pendingBlocks.contains(rawBlock))
-                pendingBlocks.remove(rawBlock);
+            pendingBlocks.remove(rawBlock);
 
             // After parsing we check if we have pending blocks we might have received earlier but which have been
             // not connecting from the latest height we had. The list is sorted by height
diff --git a/core/src/main/java/bisq/core/dao/node/lite/network/RequestBlocksHandler.java b/core/src/main/java/bisq/core/dao/node/lite/network/RequestBlocksHandler.java
index 712b2a1d86a..752e4829f87 100644
--- a/core/src/main/java/bisq/core/dao/node/lite/network/RequestBlocksHandler.java
+++ b/core/src/main/java/bisq/core/dao/node/lite/network/RequestBlocksHandler.java
@@ -149,7 +149,7 @@ public void onFailure(@NotNull Throwable throwable) {
                     log.error(errorMessage);
                     handleFault(errorMessage, nodeAddress, CloseConnectionReason.SEND_MSG_FAILURE);
                 } else {
-                    log.trace("We have stopped already. We ignore that networkNode.sendMessage.onFailure call.");
+                    log.warn("We have stopped already. We ignore that networkNode.sendMessage.onFailure call.");
                 }
             }
         }, MoreExecutors.directExecutor());
@@ -175,7 +175,7 @@ public void onMessage(NetworkEnvelope networkEnvelope, Connection connection) {
                 // have the address set. As we check the nonce later we do not care that much for the check if the
                 // connection address is the same as the one we used.
             } else if (!optionalNodeAddress.get().equals(nodeAddress)) {
-                log.warn("Peers node address is the same we requested. We ignore that message.");
+                log.warn("Peers node address is not the same we used for the request. This is not expected. We ignore that message.");
                 return;
             }