diff --git a/location.py b/location.py
index eddb1c0d33..ecc232e2f9 100644
--- a/location.py
+++ b/location.py
@@ -318,7 +318,8 @@ class Location(ModelSQL, ModelView):
 
         context = {}
         if (name == 'quantity'
-                and trans_context.get('stock_date_end') > Date_.today()):
+                and (trans_context.get('stock_date_end', datetime.date.max)
+                    > Date_.today())):
             context['stock_date_end'] = Date_.today()
 
         if name == 'forecast_quantity':