diff --git a/application/Espo/Tools/Export/Export.php b/application/Espo/Tools/Export/Export.php
index b6f2d54bef..195d56467a 100644
--- a/application/Espo/Tools/Export/Export.php
+++ b/application/Espo/Tools/Export/Export.php
@@ -131,6 +131,8 @@ class Export
 
         $collection = null;
 
+        $exportAllFields = !array_key_exists('fieldList', $params);
+
         if (array_key_exists('collection', $params)) {
             $collection = $params['collection'];
         } else {
@@ -166,6 +168,10 @@ class Export
                     $searchParams['select'] = explode(',', $searchParams['select']);
                 }
 
+                if ($exportAllFields) {
+                    unset($searchParams['select']);
+                }
+
                 $selectParams = $selectManager->getSelectParams($searchParams, true, true, true);
             }
             else {
@@ -218,15 +224,12 @@ class Export
             }
         }
 
-        if (!array_key_exists('fieldList', $params)) {
-            $exportAllFields = true;
-
+        if ($exportAllFields) {
             $fieldDefs = $this->metadata->get(['entityDefs', $this->entityType, 'fields'], []);
             $fieldList = array_keys($fieldDefs);
 
             array_unshift($fieldList, 'id');
         } else {
-            $exportAllFields = false;
             $fieldList = $params['fieldList'];
         }