diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 943daa422dc8d37fa679dbd306b252d2bc2cfa83..7cd387edb06b40ab5296a49f79fef7f1f93dad0d 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -3310,7 +3310,7 @@ def set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child
 		child_item.base_amount = 1
 	if child_doctype == "Sales Order Item":
 		child_item.warehouse = get_item_warehouse(item, p_doc, overwrite_warehouse=True)
-		if not child_item.warehouse:
+		if not child_item.warehouse and item.get("is_stock_item"):
 			frappe.throw(
 				_("Cannot find {} for item {}. Please set the same in Item Master or Stock Settings.").format(
 					frappe.bold("default warehouse"), frappe.bold(item.item_code)