diff --git a/fairmq/FairMQChannel.cxx b/fairmq/FairMQChannel.cxx
index 7e8022c5..4644d016 100644
--- a/fairmq/FairMQChannel.cxx
+++ b/fairmq/FairMQChannel.cxx
@@ -823,27 +823,26 @@ bool FairMQChannel::CheckCompatibility(unique_ptr<FairMQMessage>& msg) const
 
 bool FairMQChannel::CheckCompatibility(vector<unique_ptr<FairMQMessage>>& msgVec) const
 {
+    bool match = true;
+
     if (msgVec.size() > 0)
     {
-        if (fTransportType == msgVec.at(0)->GetType())
+        for (unsigned int i = 0; i < msgVec.size(); ++i)
         {
-            return true;
-        }
-        else
-        {
-            // LOG(WARN) << "Channel type does not match message type. Copying...";
-            vector<unique_ptr<FairMQMessage>> tempVec;
-            for (unsigned int i = 0; i < msgVec.size(); ++i)
+            if (fTransportType != msgVec.at(i)->GetType())
             {
-                tempVec.push_back(fTransportFactory->CreateMessage(msgVec[i]->GetSize()));
-                memcpy(tempVec[i]->GetData(), msgVec[i]->GetData(), msgVec[i]->GetSize());
+                // LOG(WARN) << "Channel type does not match message type. Copying...";
+                FairMQMessagePtr newMsg(fTransportFactory->CreateMessage(msgVec[i]->GetSize()));
+                memcpy(newMsg->GetData(), msgVec[i]->GetData(), msgVec[i]->GetSize());
+                msgVec[i] = move(newMsg);
+                match = false;
             }
-            msgVec = move(tempVec);
-            return false;
         }
     }
     else
     {
         return true;
     }
+
+    return match;
 }
diff --git a/fairmq/nanomsg/FairMQSocketNN.cxx b/fairmq/nanomsg/FairMQSocketNN.cxx
index ba856700..223a5712 100644
--- a/fairmq/nanomsg/FairMQSocketNN.cxx
+++ b/fairmq/nanomsg/FairMQSocketNN.cxx
@@ -282,11 +282,11 @@ int64_t FairMQSocketNN::Receive(vector<unique_ptr<FairMQMessage>>& msgVec, const
 {
 #ifdef MSGPACK_FOUND
     // Warn if the vector is filled before Receive() and empty it.
-    if (msgVec.size() > 0)
-    {
-        LOG(WARN) << "Message vector contains elements before Receive(), they will be deleted!";
-        msgVec.clear();
-    }
+    // if (msgVec.size() > 0)
+    // {
+    //     LOG(WARN) << "Message vector contains elements before Receive(), they will be deleted!";
+    //     msgVec.clear();
+    // }
 
     while (true)
     {
diff --git a/fairmq/shmem/FairMQSocketSHM.cxx b/fairmq/shmem/FairMQSocketSHM.cxx
index a3d10797..0f8448b2 100644
--- a/fairmq/shmem/FairMQSocketSHM.cxx
+++ b/fairmq/shmem/FairMQSocketSHM.cxx
@@ -301,11 +301,11 @@ int64_t FairMQSocketSHM::Receive(vector<FairMQMessagePtr>& msgVec, const int fla
     while (true)
     {
         // Warn if the vector is filled before Receive() and empty it.
-        if (msgVec.size() > 0)
-        {
-            LOG(WARN) << "Message vector contains elements before Receive(), they will be deleted!";
-            msgVec.clear();
-        }
+        // if (msgVec.size() > 0)
+        // {
+        //     LOG(WARN) << "Message vector contains elements before Receive(), they will be deleted!";
+        //     msgVec.clear();
+        // }
 
         totalSize = 0;
         more = 0;
diff --git a/fairmq/zeromq/FairMQSocketZMQ.cxx b/fairmq/zeromq/FairMQSocketZMQ.cxx
index 9016940d..04c2935b 100644
--- a/fairmq/zeromq/FairMQSocketZMQ.cxx
+++ b/fairmq/zeromq/FairMQSocketZMQ.cxx
@@ -269,11 +269,11 @@ int64_t FairMQSocketZMQ::Receive(vector<unique_ptr<FairMQMessage>>& msgVec, cons
     while (true)
     {
         // Warn if the vector is filled before Receive() and empty it.
-        if (msgVec.size() > 0)
-        {
-            LOG(WARN) << "Message vector contains elements before Receive(), they will be deleted!";
-            msgVec.clear();
-        }
+        // if (msgVec.size() > 0)
+        // {
+        //     LOG(WARN) << "Message vector contains elements before Receive(), they will be deleted!";
+        //     msgVec.clear();
+        // }
 
         totalSize = 0;
         more = 0;