diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index 570147bb449eb19c8c55348503c39f813323e981..427e8481a35e78079ea75821c97fb8bd4404c1bb 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -2126,7 +2126,7 @@ def get_auto_batch_nos(kwargs):
 			picked_batches,
 		)
 
-	if available_batches and kwargs.get("posting_date"):
+	if not kwargs.get("do_not_check_future_batches") and available_batches and kwargs.get("posting_date"):
 		filter_zero_near_batches(available_batches, kwargs)
 
 	if not kwargs.consider_negative_batches:
@@ -2144,7 +2144,8 @@ def filter_zero_near_batches(available_batches, kwargs):
 	del kwargs["posting_date"]
 	del kwargs["posting_time"]
 
-	available_batches_in_future = get_available_batches(kwargs)
+	kwargs.do_not_check_future_batches = 1
+	available_batches_in_future = get_auto_batch_nos(kwargs)
 	for batch in available_batches:
 		if batch.qty <= 0:
 			continue