diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php
index 2d6c60b28..2b6636eef 100644
--- a/classes/controller/AdminController.php
+++ b/classes/controller/AdminController.php
@@ -1211,32 +1211,25 @@ class AdminControllerCore extends Controller
         if (ob_get_level() && ob_get_length() > 0) {
             ob_clean();
         }
-        $base_fields_list = $this->fields_list;
+        $fields_to_export = array();
+        if((int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === HelperList::QLO_EXPORT_FIELDS_SELECTED){
+            $list_visibility = json_decode($this->context->cookie->{'list_visibility_'.$this->context->controller->controller_name});
+            foreach ($this->fields_list as $key => $field) {
+                if ((!isset($field['displayed']) || $field['displayed'])
+                    && (empty($field['optional'])
+                    || (!is_array($list_visibility) && !empty($field['visible_default']))
+                    || (is_array($list_visibility) && in_array($key, $list_visibility))
+                )) {
+                    $fields_to_export[$key] = $field;
+                }
+            }
+        }
 
         $this->getList($this->context->language->id, null, null, 0, false);
         if (!count($this->_list)) {
             return;
         }
-
-        if ((int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === HelperList::QLO_EXPORT_FIELDS_SELECTED) {
-            $list_visibility = json_decode($this->context->cookie->{'list_visibility_'.$this->context->controller->controller_name});
-            foreach ($this->fields_list as $key => $field) {
-                $reference_field = isset($base_fields_list[$key]) ? $base_fields_list[$key] : $field;
-
-                if (isset($reference_field['displayed']) && !$reference_field['displayed']) {
-                    unset($this->fields_list[$key]);
-                    continue;
-                }
-                if ((!isset($reference_field['optional']) || !$reference_field['optional']) && isset($base_fields_list[$key])) {
-                    continue;
-                }
-                $is_selected = (!is_array($list_visibility) && isset($reference_field['visible_default']) && $reference_field['visible_default'])
-                    || ($list_visibility && in_array($key, $list_visibility));
-                if (!$is_selected) {
-                    unset($this->fields_list[$key]);
-                }
-            }
-        }
+        $fields_to_export = (int)Configuration::get('PS_EXPORT_FIELDS_TYPE') === HelperList::QLO_EXPORT_FIELDS_SELECTED ? $fields_to_export : $this->fields_list;
 
         header('Content-type: text/csv');
         header('Content-Type: application/force-download; charset=UTF-8');
@@ -1245,9 +1238,9 @@ class AdminControllerCore extends Controller
 
         $fd = fopen('php://output', 'wb');
         $headers = array();
-        foreach ($this->fields_list as $key => $datas) {
+        foreach ($fields_to_export as $key => $datas) {
             if ('PDF' === $datas['title']) {
-                unset($this->fields_list[$key]);
+                unset($fields_to_export[$key]);
             } else {
                 if ('ID' === $datas['title']) {
                     $headers[] = strtolower(Tools::htmlentitiesDecodeUTF8($datas['title']));
@@ -1261,7 +1254,7 @@ class AdminControllerCore extends Controller
         foreach ($this->_list as $i => $row) {
             $content = array();
             $path_to_image = false;
-            foreach ($this->fields_list as $key => $params) {
+            foreach ($fields_to_export as $key => $params) {
                 $field_value = isset($row[$key]) ? Tools::htmlentitiesDecodeUTF8(Tools::nl2br($row[$key])) : '';
                 if ($key == 'image') {
                     if ($params['image'] != 'p' || Configuration::get('PS_LEGACY_IMAGES')) {
diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index 551e9c207..82be1dc94 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -384,13 +384,13 @@ class AdminAddressesControllerCore extends AdminController
     public function processExport($text_delimiter = '"')
     {
         $this->fields_list = array_merge($this->fields_list, array(
-            'email' => array('title' => $this->l('Customer Email')),
-            'phone' => array('title' => $this->l('Phone'), 'filter_key' => 'a!phone'),
-            'phone_mobile' => array('title' => $this->l('Mobile phone')),
-            'address1' => array('title' => $this->l('Address (2)')),
-            'dni' => array('title' => $this->l('Identification Number')),
-            'vat_number' => array('title' => $this->l('VAT number')),
-            'other' => array('title' => $this->l('Other')),
+            'email' => array('title' => $this->l('Customer Email'), 'displayed' => false),
+            'phone' => array('title' => $this->l('Phone'), 'filter_key' => 'a!phone', 'displayed' => false),
+            'phone_mobile' => array('title' => $this->l('Mobile phone'), 'displayed' => false),
+            'address2' => array('title' => $this->l('Address (2)'), 'displayed' => false),
+            'dni' => array('title' => $this->l('Identification Number'), 'displayed' => false),
+            'vat_number' => array('title' => $this->l('VAT number'), 'displayed' => false),
+            'other' => array('title' => $this->l('Other'), 'displayed' => false),
         ));
 
         return parent::processExport($text_delimiter);