diff --git a/src/app/core/utils.ts b/src/app/core/utils.ts
index f0ccc6f6c..67c233f51 100644
--- a/src/app/core/utils.ts
+++ b/src/app/core/utils.ts
@@ -5,7 +5,10 @@ export const setProfessionalEmails = (
 ): EmailsEndpoint => {
   emails?.emailDomains?.forEach((domain) => {
     emails?.emails?.forEach((email) => {
-      if (email?.value?.includes(domain?.value)) {
+      if (
+        email?.value?.split('@')[1].endsWith('.' + domain?.value) ||
+        email?.value?.split('@')[1] === domain?.value
+      ) {
         email.professionalEmail = true
       }
     })