diff --git a/erpnext/public/js/utils/barcode_scanner.js b/erpnext/public/js/utils/barcode_scanner.js
index b8d1b4afa2a..1c3d5d160e6 100644
--- a/erpnext/public/js/utils/barcode_scanner.js
+++ b/erpnext/public/js/utils/barcode_scanner.js
@@ -459,12 +459,8 @@ erpnext.utils.BarcodeScanner = class BarcodeScanner {
 			const item_scanned = row.has_item_scanned;
 
 			let warehouse_match = true;
-			if (has_warehouse_field) {
-				if (warehouse) {
-					warehouse_match = row[warehouse_field] === warehouse;
-				} else {
-					warehouse_match = !row[warehouse_field];
-				}
+			if (has_warehouse_field && warehouse && row[warehouse_field]) {
+				warehouse_match = row[warehouse_field] === warehouse;
 			}
 
 			return (
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 67918ee1dfd..ea2ec897d1d 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -1006,7 +1006,7 @@ erpnext.stock.StockEntry = class StockEntry extends erpnext.stock.StockControlle
 		this.barcode_scanner = new erpnext.utils.BarcodeScanner({
 			frm: this.frm,
 			warehouse_field: (doc) => {
-				return doc.purpose === "Material Transfer" ? "t_warehouse" : "s_warehouse";
+				return doc.purpose === "Material Receipt" ? "t_warehouse" : "s_warehouse";
 			},
 		});