diff --git a/client/src/views/email/fields/compose-from-address.js b/client/src/views/email/fields/compose-from-address.js
index b4c468aabd..bf764a9c11 100644
--- a/client/src/views/email/fields/compose-from-address.js
+++ b/client/src/views/email/fields/compose-from-address.js
@@ -42,11 +42,10 @@ Espo.define('views/email/fields/compose-from-address', 'views/fields/base', func
             Dep.prototype.setup.call(this);
             this.list = [];
 
-            /*if (this.getUser().get('emailAddress') && this.getPreferences().get('smtpServer')) {
-                this.list.push(this.getUser().get('emailAddress'));
-            }*/
-
-            this.list.push(this.getUser().get('emailAddress'));
+            var primaryEmailAddress = this.getUser().get('emailAddress');
+            if (primaryEmailAddress) {
+                this.list.push(primaryEmailAddress);
+            }
 
             var emailAddressList = this.getUser().get('emailAddressList') || [];
             emailAddressList.forEach(function (item) {