diff --git a/src/components/PutAwayScan/PutAwayCamScan.tsx b/src/components/PutAwayScan/PutAwayCamScan.tsx
index 85a0b9a..00b6c0a 100644
--- a/src/components/PutAwayScan/PutAwayCamScan.tsx
+++ b/src/components/PutAwayScan/PutAwayCamScan.tsx
@@ -90,12 +90,13 @@ const PutAwayCamScan: React.FC<Props> = ({ warehouse }) => {
     [scannedSilId, scannedWareHouseId],
   );
 
+  // Open modal only after both stock-in-line and location (warehouse) are scanned
   useEffect(() => {
-    if (scannedSilId > 0) {
+    if (scannedSilId > 0 && scannedWareHouseId > 0) {
       setOpenPutAwayModal(true);
       setScanStatus("pending");
     }
-  }, [scannedSilId]);
+  }, [scannedSilId, scannedWareHouseId]);
 
   const closeModal = () => {
     setScannedSilId(0);
@@ -108,11 +109,14 @@ const PutAwayCamScan: React.FC<Props> = ({ warehouse }) => {
     if (scanStatus === "scanning") {
       return t("Scanning");
     }
-    if (scannedSilId > 0) {
+    if (scannedSilId > 0 && scannedWareHouseId > 0) {
       return t("Scanned, opening detail");
     }
+    if (scannedSilId > 0) {
+      return t("Please scan warehouse qr code");
+    }
     return t("Pending scan");
-  }, [scanStatus, scannedSilId, t]);
+  }, [scanStatus, scannedSilId, scannedWareHouseId, t]);
 
   const scannerConfig: ScannerConfig = {
     ...defaultScannerConfig,