diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp
index c04d3d5b4f0..5439693a071 100644
--- a/src/cpp/rtps/messages/MessageReceiver.cpp
+++ b/src/cpp/rtps/messages/MessageReceiver.cpp
@@ -812,6 +812,9 @@ bool MessageReceiver::proc_Submsg_Data(
         return false;
     }
 
+    // Get the vendor id
+    ch.vendor_id = source_vendor_id_;
+
     //Jump ahead if more parameters are before inlineQos (not in this version, maybe if further minor versions.)
     if (octetsToInlineQos > RTPSMESSAGE_OCTETSTOINLINEQOS_DATASUBMSG)
     {
@@ -988,6 +991,9 @@ bool MessageReceiver::proc_Submsg_DataFrag(
         return false;
     }
 
+    // Get the vendor id
+    ch.vendor_id = source_vendor_id_;
+
     // READ FRAGMENT NUMBER
     uint32_t fragmentStartingNum;
     valid &= CDRMessage::readUInt32(msg, &fragmentStartingNum);
diff --git a/versions.md b/versions.md
index 1d23a92d97d..bc8f2bfeb91 100644
--- a/versions.md
+++ b/versions.md
@@ -2,6 +2,7 @@ Forthcoming
 -----------
 
 * Added new `flow_controller_descriptor_list` XML configuration.
+* Setting vendor_id in the received CacheChange_t for Data and DataFrag.
 
 Version 2.14.0
 --------------