diff --git a/services/web/frontend/js/features/settings/components/emails/add-email.tsx b/services/web/frontend/js/features/settings/components/emails/add-email.tsx
index ffa8e86bb7..db0914c0eb 100644
--- a/services/web/frontend/js/features/settings/components/emails/add-email.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/add-email.tsx
@@ -120,7 +120,8 @@ function AddEmail() {
             />
           </Cell>
         </Col>
-        {ssoAvailableForDomain(newEmailMatchedDomain) ? (
+        {newEmailMatchedDomain &&
+        ssoAvailableForDomain(newEmailMatchedDomain) ? (
           <Col md={8}>
             <Cell>
               <SsoLinkingInfo
diff --git a/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx b/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx
index 1de8743a04..9119d4414c 100644
--- a/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/add-email/input.tsx
@@ -125,11 +125,17 @@ function Input({ onChange, handleAddNewEmail }: InputProps) {
 
         if (suggestion) {
           setInputValueAndResetSuggestion()
-        } else {
-          const match = matchLocalAndDomain(inputValue)
-          if (match.local && match.domain) {
-            handleAddNewEmail()
-          }
+
+          return
+        }
+
+        if (!inputValue) {
+          return
+        }
+
+        const match = matchLocalAndDomain(inputValue)
+        if (match.local && match.domain) {
+          handleAddNewEmail()
         }
       }
 
diff --git a/services/web/frontend/js/features/settings/components/emails/email.tsx b/services/web/frontend/js/features/settings/components/emails/email.tsx
index e227604e92..a05850513a 100644
--- a/services/web/frontend/js/features/settings/components/emails/email.tsx
+++ b/services/web/frontend/js/features/settings/components/emails/email.tsx
@@ -11,7 +11,7 @@ function Email({ userEmailData }: EmailProps) {
   const { t } = useTranslation()
 
   const ssoAvailable = ssoAvailableForInstitution(
-    userEmailData.affiliation?.institution
+    userEmailData.affiliation?.institution || null
   )
 
   return (