diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 60f5ff3629b..3c4e35349e6 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -49,17 +49,21 @@ frappe.ui.form.on('Material Request', {
 		// set schedule_date
 		set_schedule_date(frm);
 
-		let filters = {'company': frm.doc.company}
-
-		frm.set_query("warehouse", "items", function() {
+		frm.set_query("warehouse", "items", function(doc) {
 			return {
-				filters: filters
+				filters: {'company': doc.company}
 			};
 		});
 
-		frm.set_query("set_warehouse", function(){
+		frm.set_query("set_warehouse", function(doc){
 			return {
-				filters: filters
+				filters: {'company': doc.company}
+			};
+		});
+
+		frm.set_query("set_from_warehouse", function(doc){
+			return {
+				filters: {'company': doc.company}
 			};
 		});
 	},