diff --git a/com.twin.app.shoptime/src/views/JustForYouTestPanel/JustForYouTestPanel.jsx b/com.twin.app.shoptime/src/views/JustForYouTestPanel/JustForYouTestPanel.jsx
index 51733d3c..ae359ff7 100644
--- a/com.twin.app.shoptime/src/views/JustForYouTestPanel/JustForYouTestPanel.jsx
+++ b/com.twin.app.shoptime/src/views/JustForYouTestPanel/JustForYouTestPanel.jsx
@@ -82,7 +82,7 @@ const JustForYouTestPanel = ({ panelInfo, ...rest }) => {
   }, [shelfInfos]);
 
   const renderItem = useCallback(
-    (shelfId, productInfos) =>
+    (shelfId, shelfExpsOrd, productInfos) =>
       ({ index, ...rest }) => {
         if (!productInfos || !productInfos[index]) {
           return null;
@@ -130,7 +130,7 @@ const JustForYouTestPanel = ({ panelInfo, ...rest }) => {
             productName={title}
             productId={contentId}
             onClick={handleItemClick}
-            spotlightId={`spotlightId-${shelfId}-${removeDotAndColon(contentId).replaceAll(" ", "")}`}
+            spotlightId={`spotlightId-${shelfId}-${shelfExpsOrd}-${removeDotAndColon(contentId).replaceAll(" ", "")}`}
             {...rest}
           />
         );
@@ -196,6 +196,7 @@ const JustForYouTestPanel = ({ panelInfo, ...rest }) => {
                               spacing={18}
                               renderItem={renderItem(
                                 shelf.shelfId,
+                                shelf.shelfExpsOrd,
                                 shelf.productInfos
                               )}
                               direction="horizontal"