diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index 0980c6ea58..222e325394 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -940,6 +940,12 @@ namespace Bit.Core.Services
                 }
             }
 
+            var existingOrgUser = await _organizationUserRepository.GetByOrganizationAsync(orgUser.OrganizationId, user.Email);
+            if(existingOrgUser != null)
+            {
+                throw new BadRequestException("You are already part of this organization.");
+            }
+
             var tokenValidationFailed = true;
             try
             {