diff --git a/src/Oro/Bundle/AccountBundle/Resources/config/oro/entity.yml b/src/Oro/Bundle/AccountBundle/Resources/config/oro/entity.yml
index 10e4546d0b2..912c229d375 100644
--- a/src/Oro/Bundle/AccountBundle/Resources/config/oro/entity.yml
+++ b/src/Oro/Bundle/AccountBundle/Resources/config/oro/entity.yml
@@ -12,8 +12,9 @@ oro_entity:
             contactInformation:
                 query:
                     select:
-                        expr:         defaultContact.email
+                        expr:         emails.email
                         return_type:  string
                     join:
                         left:
                             - { join: entity.defaultContact, alias: defaultContact }
+                            - { join: defaultContact.emails, alias: emails, conditionType: 'WITH', condition: 'emails.primary = true' }