diff --git a/lib/ConsumerImpl.cc b/lib/ConsumerImpl.cc
index 1060cd5c..e9ab7bde 100644
--- a/lib/ConsumerImpl.cc
+++ b/lib/ConsumerImpl.cc
@@ -1117,14 +1117,6 @@ Result ConsumerImpl::receiveHelper(Message& msg, int timeout) {
         if (state_ != Ready) {
             return ResultAlreadyClosed;
         }
-        auto cnx = getCnx().lock();
-        if (cnx) {
-            LOG_WARN(getName() << " Receive timeout after " << timeout << " ms, connection: "
-                               << cnx->cnxString() << ", queue size: " << incomingMessages_.size());
-        } else {
-            LOG_WARN(getName() << " Receive timeout after " << timeout
-                               << " ms, no connection, queue size: " << incomingMessages_.size());
-        }
         return ResultTimeout;
     }
 }
diff --git a/lib/MultiTopicsConsumerImpl.cc b/lib/MultiTopicsConsumerImpl.cc
index 5e1b5171..4f5f9f71 100644
--- a/lib/MultiTopicsConsumerImpl.cc
+++ b/lib/MultiTopicsConsumerImpl.cc
@@ -603,14 +603,6 @@ Result MultiTopicsConsumerImpl::receive(Message& msg, int timeout) {
         if (state_ != Ready) {
             return ResultAlreadyClosed;
         }
-        auto cnx = getCnx().lock();
-        if (cnx) {
-            LOG_WARN(getName() << " Receive timeout after " << timeout << " ms, connection: "
-                               << cnx->cnxString() << ", queue size: " << incomingMessages_.size());
-        } else {
-            LOG_WARN(getName() << " Receive timeout after " << timeout
-                               << " ms, no connection, queue size: " << incomingMessages_.size());
-        }
         return ResultTimeout;
     }
 }
diff --git a/lib/ProducerImpl.cc b/lib/ProducerImpl.cc
index 873796dc..4697e72b 100644
--- a/lib/ProducerImpl.cc
+++ b/lib/ProducerImpl.cc
@@ -873,6 +873,9 @@ void ProducerImpl::handleSendTimeout(const ASIO_ERROR& err) {
     }
 
     lock.unlock();
+    if (pendingMessages.empty()) {
+        return;
+    }
     auto cnx = getCnx().lock();
     if (cnx) {
         LOG_WARN(getName() << "Send timeout due to queueing delay, connection: " << cnx->cnxString()