diff --git a/linux/spi/SpiComIF.cpp b/linux/spi/SpiComIF.cpp
index f2dbce3..cd76616 100644
--- a/linux/spi/SpiComIF.cpp
+++ b/linux/spi/SpiComIF.cpp
@@ -173,6 +173,12 @@ ReturnValue_t SpiComIF::sendMessage(CookieIF *cookie, const uint8_t *sendData, s
 
 ReturnValue_t SpiComIF::performRegularSendOperation(SpiCookie *spiCookie, const uint8_t *sendData,
         size_t sendLen) {
+    address_t spiAddress = spiCookie->getSpiAddress();
+    auto iter = spiDeviceMap.find(spiAddress);
+    if(iter == spiDeviceMap.end()) {
+        spiCookie->assignReadBuffer(iter->second.replyBuffer.data());
+    }
+
     ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
     int retval = 0;
     /* Prepare transfer */