diff --git a/fontawesome_iconpicker.module b/fontawesome_iconpicker.module
index c7f0247..0bc7aa9 100644
--- a/fontawesome_iconpicker.module
+++ b/fontawesome_iconpicker.module
@@ -111,7 +111,6 @@ function fontawesome_iconpicker_field_widget_form(&$form, &$form_state, $field,
         '#attributes' => array('class' => array('text-full')),
       );
       break;
-
     case 'fontawesome_iconpicker_icon_field':
       $element['bundle'] = array(
         '#type' => 'value',
@@ -135,14 +134,17 @@ function fontawesome_iconpicker_field_widget_form(&$form, &$form_state, $field,
  * Helper function to remove the fontawesome prefix for icon api fields.
  */
 function fontawesome_iconpicker_icon_field_icon_value_callback($element, $input = FALSE, $form_state = array()) {
-  if ($input) {
+  if ($input !== FALSE) {
     $prefix = FONTAWESOME_ICONPICKER_ICON_PREFIX;
     $str = trim($input);
     if (substr($str, 0, strlen($prefix)) == $prefix) {
       $str = substr($str, strlen($prefix));
       return $str;
     }
+  } else {
+    return isset($element['#default_value']) ? $element['#default_value'] : NULL;
   }
+
   return $input;
 }