diff --git a/libuavcan/include/uavcan/node/generic_subscriber.hpp b/libuavcan/include/uavcan/node/generic_subscriber.hpp
index 2cb6083ddf..0782d718bf 100644
--- a/libuavcan/include/uavcan/node/generic_subscriber.hpp
+++ b/libuavcan/include/uavcan/node/generic_subscriber.hpp
@@ -207,10 +207,13 @@ protected:
     TransferListenerType* getTransferListener() { return forwarder_; }
 
     /**
-     * Returns the mutable reference to the temporary storage for decoded received messages.
+     * Returns a reference to the temporary storage for decoded received messages.
      * Reference to this storage is used as a parameter for subscription callbacks.
+     * This storage is guaranteed to stay intact after the last message was decoded, i.e.
+     * the application can use it to access the last received message object.
      */
-    ReceivedDataStructure<DataStruct>& getReceivedStructStorage() { return message_; }
+    ReceivedDataStructure<DataStruct>& getReceivedStructStorage()             { return message_; }
+    const ReceivedDataStructure<DataStruct>& getReceivedStructStorage() const { return message_; }
 };
 
 // ----------------------------------------------------------------------------