diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php
index cf1e7eb80d..6d7c6098bc 100644
--- a/importexport/inc/class.importexport_export_ui.inc.php
+++ b/importexport/inc/class.importexport_export_ui.inc.php
@@ -99,6 +99,7 @@ class importexport_export_ui {
 		}
 		if(count($sel_options['definition']) == 2 && !$content['definition']) {
 			$content['definition'] = end($sel_options['definition']);
+			unset($sel_options['definition']['']);
 		}
 		unset($definitions);
 		//$sel_options['definition']['expert'] = lang('Expert options');
diff --git a/importexport/inc/class.importexport_widget_filter.inc.php b/importexport/inc/class.importexport_widget_filter.inc.php
index ce0246cea3..47ce3cc7ba 100644
--- a/importexport/inc/class.importexport_widget_filter.inc.php
+++ b/importexport/inc/class.importexport_widget_filter.inc.php
@@ -127,7 +127,10 @@ class importexport_widget_filter extends Etemplate\Widget\Transformer
 						}
 
 						// We don't want the 'All' or 'Select...' if it's there
-						unset($field['values']['']);
+						if(is_array($field['values']) && $field['values'][''])
+						{
+							unset($field['values']['']);
+						}
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'empty_label', '');
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);