diff --git a/includes/form.inc b/includes/form.inc
index 3d5e9497d00cc67e7574709ca446a0b1450cc463..91698e473d91bbd8577a39acea91edfff516dc63 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -339,7 +339,12 @@ function form_builder($form_id, $form) {
             $form['#value'] = !empty($edit) ? $form['#return_value'] : 0;
             break;
           case 'select':
-            $form['#value'] = isset($edit) ? $edit : array();
+            if (isset($edit)) {
+              $form['#value'] = $edit;
+            }
+            elseif (isset($form['#multiple']) && $form['#multiple']) {
+              $form['#value'] = array();
+            }
             break;
           case 'textfield':
             if (isset($edit)) {
@@ -874,7 +879,7 @@ function theme_button($element) {
   else {
     $element['#attributes']['class'] = 'form-'. $element['#button_type'];
   }
-  
+
   return '<input type="submit" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ') .'value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
 }