diff --git a/components/date.inc b/components/date.inc
index 8f8f5a4..f62afa2 100644
--- a/components/date.inc
+++ b/components/date.inc
@@ -126,7 +126,7 @@ function _webform_render_date($component, $value = NULL, $filter = TRUE) {
     '#year_start' => $component['extra']['year_start'],
     '#year_end' => $component['extra']['year_end'],
     '#year_textfield' => $component['extra']['year_textfield'],
-    '#default_value' => $component['value'],
+    '#default_value' => $filter ? _webform_filter_values($component['value'], NULL, NULL, NULL, FALSE) : $component['value'],
     '#timezone' => $component['extra']['timezone'],
     '#process' => array('webform_expand_date'),
     '#theme' => 'webform_date',
diff --git a/components/time.inc b/components/time.inc
index 461c13c..96deb5a 100644
--- a/components/time.inc
+++ b/components/time.inc
@@ -90,7 +90,7 @@ function _webform_render_time($component, $value = NULL, $filter = TRUE) {
     '#description' => $filter ? _webform_filter_descriptions($component['extra']['description']) : $component['extra']['description'],
     '#element_validate' => array('webform_validate_time'),
     '#hourformat' => $component['extra']['hourformat'],
-    '#default_value' => $component['value'],
+    '#default_value' => $filter ? _webform_filter_values($component['value'], NULL, NULL, NULL, FALSE) : $component['value'],
     '#timezone' => $component['extra']['timezone'],
     '#process' => array('webform_expand_time'),
     '#theme' => 'webform_time',