diff --git a/gravity-forms/gw-force-default-value.php b/gravity-forms/gw-force-default-value.php
index a5d54518d..ae6665813 100644
--- a/gravity-forms/gw-force-default-value.php
+++ b/gravity-forms/gw-force-default-value.php
@@ -80,10 +80,14 @@ public function add_default_values_to_entry( $entry, $form ) {
 				continue;
 			}
 
-			$value = GFCommon::replace_variables( $value, $form, $entry );
+			$value = is_string( $value ) ? GFCommon::replace_variables( $value, $form, $entry ) : $value;
 
 			if ( $value != $entry_value ) {
 				$requires_update     = true;
+				// For array based values like Date Field and Time Field.
+				if ( is_array( $value ) ) {
+					$value = $field->get_value_save_entry( $value, $form, null, null, null );
+				}
 				$entry[ $field->id ] = $value;
 			}
 		}
@@ -109,7 +113,7 @@ public function replace_unreplaced_merge_tags( $text ) {
 			return $text;
 		}
 		$chars = str_split( trim( $text ) );
-		if ( $chars[0] === '{' && $chars[ count( $chars ) - 1 ] === '}' ) {
+		if ( rgar( $chars, 0 ) === '{' && rgar( $chars, count( $chars ) - 1 ) === '}' ) {
 			$text = '';
 		}
 		return $text;