diff --git a/src/components/estimate/Estimate.jsx b/src/components/estimate/Estimate.jsx
index c9a38727..4e331009 100644
--- a/src/components/estimate/Estimate.jsx
+++ b/src/components/estimate/Estimate.jsx
@@ -1782,11 +1782,15 @@ export default function Estimate({}) {
                                     }}
                                     menuPlacement={'auto'}
                                     getOptionLabel={(x) => x.itemName}
-                                    getOptionValue={(x) => x.itemId}
+                                    getOptionValue={(x) => x.itemNo}
                                     isClearable={false}
                                     isDisabled={!!item?.paDispOrder}
                                     value={displayItemList.filter(function (option) {
-                                      return option.itemId === item.itemId
+                                      if (item.itemNo === '') {
+                                        return false
+                                      } else {
+                                        return option.itemId === item.itemId
+                                      }
                                     })}
                                   />
                                 </div>