diff --git a/views/options/field-types/text.php b/views/options/field-types/text.php
index 026c19a31..132111054 100644
--- a/views/options/field-types/text.php
+++ b/views/options/field-types/text.php
@@ -9,11 +9,9 @@
  * @since 2.0.0
  */
 
-$value = $this->get( $field['key'] );
-if ( empty( $value ) && isset( $field['default'] ) ) {
-	$value = $field['default'];
-}
-$field_key     = isset( $field['key'] ) ? esc_attr( $field['key'] ) : null;
+$field_key     = sanitize_key( $field['key'] );
+$default       = isset( $field['default'] ) ? $field['default'] : false;
+$value         = $this->get( $field_key, $default );
 $field_id      = esc_attr( 'field_' . $field_key );
 $placeholder   = isset( $field['placeholder'] ) ? esc_attr( $field['placeholder'] ) : esc_attr( $field['desc'] );
 $field_classes = isset( $field['field_classes'] ) ? $field['field_classes'] : '';
diff --git a/views/options/field-types/textarea.php b/views/options/field-types/textarea.php
index 39df4520d..68ec1601e 100644
--- a/views/options/field-types/textarea.php
+++ b/views/options/field-types/textarea.php
@@ -9,12 +9,9 @@
  * @since 2.0.0
  */
 
-$field_key = sanitize_key( $field['key'] );
-$value     = $this->get( $field_key );
-if ( empty( $value ) && isset( $field['default'] ) ) {
-	$value = $field['default'];
-}
-
+$field_key   = sanitize_key( $field['key'] );
+$default     = isset( $field['default'] ) ? $field['default'] : false;
+$value       = $this->get( $field_key, $default );
 $field_id    = sanitize_key( 'field_' . $field_key );
 $placeholder = isset( $field['placeholder'] ) ? $field['placeholder'] : $field['desc'];
 $max_length  = isset( $field['maxlength'] ) ? (int) $field['maxlength'] : 0;