diff --git a/product.py b/product.py
index be694ff1f5..6bb1fd0add 100644
--- a/product.py
+++ b/product.py
@@ -393,8 +393,8 @@ class Product:
             if periods:
                 period, = periods
                 state_date_clause += (' AND '
-                    '(COALESCE(effective_date, planned_date) > %s)')
-                state_date_vals.append(period.date)
+                    '(COALESCE(effective_date, planned_date, %s) > %s)')
+                state_date_vals.extend([datetime.date.max, period.date])
                 period_vals[0] = period.id
 
         if with_childs: