diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt
index aa2515de39..27b097d681 100644
--- a/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt
+++ b/android/navi-chat/src/main/java/com/navi/chat/ui/fragments/NaviChatFragment.kt
@@ -1,6 +1,6 @@
 /*
  *
- *  * Copyright © 2023 by Navi Technologies Limited
+ *  * Copyright © 2023-2024 by Navi Technologies Limited
  *  * All rights reserved. Strictly confidential
  *
  */
@@ -860,7 +860,9 @@ class NaviChatFragment : BaseFragment(), WidgetCallback, MessageOperation, Toolb
                 sourceId = naviChatSystemLocalData?.sourceId ?: EMPTY,
                 userName = naviChatSystemLocalData?.currentUserName ?: EMPTY,
                 metaData = naviChatSystemLocalData?.metaData,
-                idempotencyKey = naviChatSystemLocalData?.idempotencyKey,
+                idempotencyKey =
+                    naviChatSystemLocalData?.metaData?.get(ORDER_ID)
+                        ?: naviChatSystemLocalData?.idempotencyKey,
                 conversationId = conversationId,
                 isFromNotification = naviChatSystemLocalData?.isFromNotification ?: false,
                 shouldShowCsat = naviChatSystemLocalData?.shouldShowCsat == true,
@@ -2028,6 +2030,7 @@ class NaviChatFragment : BaseFragment(), WidgetCallback, MessageOperation, Toolb
 
     companion object {
         const val TAG = "NaviChatFragment"
+        const val ORDER_ID = "order_id"
         private const val DELAY_TO_SCROLL = 200L
         private const val MARGIN_TO_RIGHT = 16
         private const val ANIMATION_DURATION = 400L