diff --git a/includes/webform.components.inc b/includes/webform.components.inc
index b776cf8..87e9281 100644
--- a/includes/webform.components.inc
+++ b/includes/webform.components.inc
@@ -619,7 +619,7 @@ function webform_component_edit_form_submit($form, &$form_state) {
   // Remove empty extra values.
   if (isset($form_state['values']['extra'])) {
     foreach ($form_state['values']['extra'] as $key => $value) {
-      if ($value  === '') {
+      if ($value  === '' && !array_key_exists('', $form['display'][$key]['#options'])) {
         unset($form_state['values']['extra'][$key]);
       }
     }