diff --git a/src/clj/auto_ap/ssr/utils.clj b/src/clj/auto_ap/ssr/utils.clj
index 6899c91f..cf7b5df9 100644
--- a/src/clj/auto_ap/ssr/utils.clj
+++ b/src/clj/auto_ap/ssr/utils.clj
@@ -190,13 +190,17 @@
               [:fn
                {:error/message "Invalid date"}
                (fn [d]
-                 (time/after? (coerce/to-date-time d) 
-                              (coerce/to-date-time #inst "2000-01-01")))]
+                 (if d 
+                   (time/after? (coerce/to-date-time d)
+                                (coerce/to-date-time #inst "2000-01-01"))
+                   true))]
               [:fn
                {:error/message "Invalid date"}
                (fn [d]
-                 (time/before? (coerce/to-date-time d)
-                              (time/plus (time/now) (time/years 2))))]]))
+                 (if d 
+                   (time/before? (coerce/to-date-time d)
+                                 (time/plus (time/now) (time/years 2)))
+                   true))]]))
 
 (def date-transformer
   (mt2/transformer