diff --git a/src/lib/ebus/message.cpp b/src/lib/ebus/message.cpp
index 5635f802..6fded6db 100644
--- a/src/lib/ebus/message.cpp
+++ b/src/lib/ebus/message.cpp
@@ -659,7 +659,7 @@ result_t Message::storeLastData(SymbolString& master, SymbolString& slave) {
 
 result_t Message::storeLastData(const PartType partType, SymbolString& data, unsigned char index) {
   if (data.size() > 0
-  && (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData)) {
+  && (m_isWrite || this->m_dstAddress == BROADCAST || partType == pt_slaveData || (partType == pt_masterData && isMaster(this->m_dstAddress)))) {
     time(&m_lastUpdateTime);
   }
   if (partType == pt_masterData) {