diff --git a/app/code/Magento/GiftMessage/Model/OrderRepository.php b/app/code/Magento/GiftMessage/Model/OrderRepository.php
index 741cce2a4aad0af367e3b5e7010010732f5e8aba..5bbff94c44bf9cb0d26b84683964dfc051ed1a17 100644
--- a/app/code/Magento/GiftMessage/Model/OrderRepository.php
+++ b/app/code/Magento/GiftMessage/Model/OrderRepository.php
@@ -120,9 +120,10 @@ class OrderRepository implements \Magento\GiftMessage\Api\OrderRepositoryInterfa
         $message = [];
         $message[$orderId] = [
             'type' => 'order',
-            'sender' => $giftMessage->getSender(),
-            'recipient' => $giftMessage->getRecipient(),
-            'message' => $giftMessage->getMessage(),
+            $giftMessage::CUSTOMER_ID => $giftMessage->getCustomerId(),
+            $giftMessage::SENDER => $giftMessage->getSender(),
+            $giftMessage::RECIPIENT => $giftMessage->getRecipient(),
+            $giftMessage::MESSAGE => $giftMessage->getMessage(),
         ];
 
         $this->giftMessageSaveModel->setGiftmessages($message);