diff --git a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt
index 9353f4ece1..817de6e25c 100644
--- a/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt
+++ b/android/navi-chat/src/main/java/com/navi/chat/ui/activities/NaviChatActivity.kt
@@ -94,6 +94,15 @@ class NaviChatActivity :
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
+        val newProductConfigId =
+            intent
+                ?.extras
+                ?.getParcelable<NaviChatSystemLocalData>(NAVI_CHAT_SYSTEM_LOCAL_DATA)
+                ?.source
+        if (newProductConfigId != null && newProductConfigId != productConfigId) {
+            finish()
+            startActivity(intent)
+        }
         chatFragment?.scrollChatToLatestMessageReceived()
     }
 
@@ -121,6 +130,12 @@ class NaviChatActivity :
                 bundle.putString(SCREEN_NAME, it)
                 productConfigId = it
             }
+            if (productConfigId == null) {
+                productConfigId =
+                    intent.extras
+                        ?.getParcelable<NaviChatSystemLocalData>(NAVI_CHAT_SYSTEM_LOCAL_DATA)
+                        ?.source
+            }
             arguments = bundle
         }