diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index 7521e100232c..aac4c45b15f0 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -585,7 +585,7 @@ function WorkspacesListPage() {
         }
 
         return Object.values(allDomains).reduce<DomainItem[]>((domainItems, domain) => {
-            if (!domain) {
+            if (!domain || !domain.accountID || !domain.email) {
                 return domainItems;
             }
 
diff --git a/src/types/onyx/Domain.ts b/src/types/onyx/Domain.ts
index 22a3bd61f603..7eb6cac4eae3 100644
--- a/src/types/onyx/Domain.ts
+++ b/src/types/onyx/Domain.ts
@@ -18,7 +18,7 @@ type Domain = OnyxCommon.OnyxValueWithOfflineFeedback<{
     email: string;
 
     /** Validation code for the domain */
-    validateCode: string;
+    validateCode?: string;
 
     /** Whether domain validation is pending */
     isValidationPending?: boolean;