diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Email.php b/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
index 8fd93d9c82..df8c541626 100644
--- a/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
+++ b/application/Espo/Core/Utils/Database/Orm/Fields/Email.php
@@ -38,6 +38,7 @@ class Email extends Base
                 'fields' => array(
                     $fieldName => array(
                         'select' => 'emailAddresses.name',
+                        'fieldType' => 'email',
                         'where' =>
                         array (
                             'LIKE' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
diff --git a/application/Espo/Core/Utils/Database/Orm/Fields/Phone.php b/application/Espo/Core/Utils/Database/Orm/Fields/Phone.php
index d04be3d052..fe95bdf40f 100644
--- a/application/Espo/Core/Utils/Database/Orm/Fields/Phone.php
+++ b/application/Espo/Core/Utils/Database/Orm/Fields/Phone.php
@@ -38,6 +38,7 @@ class Phone extends Base
                 'fields' => array(
                     $fieldName => array(
                         'select' => 'phoneNumbers.name',
+                        'fieldType' => 'phone',
                         'where' =>
                         array (
                             'LIKE' => \Espo\Core\Utils\Util::toUnderScore($entityName) . ".id IN (
diff --git a/application/Espo/Services/Import.php b/application/Espo/Services/Import.php
index 26aec7e149..b050375764 100644
--- a/application/Espo/Services/Import.php
+++ b/application/Espo/Services/Import.php
@@ -548,7 +548,11 @@ class Import extends \Espo\Services\Record
         $relDefs = $entity->getRelations();
 
         $phoneFieldList = [];
-        if (!empty($attributeDefs['phoneNumber']) && !empty($attributeDefs['phoneNumber']['type']) && $attributeDefs['phoneNumber']['type'] == 'phone') {
+        if (
+            $entity->hasAttribute('phoneNumber')
+            &&
+            $entity->getAttributeParam('phoneNumber', 'fieldType') === 'phone'
+        ) {
             $typeList = $this->getMetadata()->get('entityDefs.' . $scope . '.fields.phoneNumber.typeList', []);
             foreach ($typeList as $type) {
                 $attr = str_replace(' ', '_', ucfirst($type));