diff --git a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx
index b8bf34b7ba..5e7a67d179 100644
--- a/app/client/src/ce/pages/workspace/InviteUsersForm.tsx
+++ b/app/client/src/ce/pages/workspace/InviteUsersForm.tsx
@@ -388,7 +388,7 @@ function InviteUsersForm(props: any) {
         const validEmails = usersAsStringsArray.filter((user: string) =>
           isEmail(user),
         );
-        const validEmailsString = validEmails.join(",");
+        const validEmailsString = [...new Set(validEmails)].join(",");
         invitedEmails.current = validEmails;
 
         AnalyticsUtil.logEvent("INVITE_USER", {
diff --git a/app/client/src/ce/sagas/userSagas.tsx b/app/client/src/ce/sagas/userSagas.tsx
index 2bde6af6ff..c8b7a91c6a 100644
--- a/app/client/src/ce/sagas/userSagas.tsx
+++ b/app/client/src/ce/sagas/userSagas.tsx
@@ -351,10 +351,11 @@ export function* inviteUsers(
 ) {
   const { data, reject, resolve } = action.payload;
   try {
-    const response: ApiResponse = yield callAPI(UserApi.inviteUser, {
-      usernames: data.usernames,
-      permissionGroupId: data.permissionGroupId,
-    });
+    const response: ApiResponse<{ id: string; username: string }[]> =
+      yield callAPI(UserApi.inviteUser, {
+        usernames: data.usernames,
+        permissionGroupId: data.permissionGroupId,
+      });
     const isValidResponse: boolean = yield validateResponse(response, false);
     if (!isValidResponse) {
       let errorMessage = `${data.usernames}:  `;
@@ -367,12 +368,14 @@ export function* inviteUsers(
         workspaceId: data.workspaceId,
       },
     });
+    const { data: responseData } = response;
     yield put({
       type: ReduxActionTypes.INVITED_USERS_TO_WORKSPACE,
       payload: {
         workspaceId: data.workspaceId,
-        users: data.usernames.map((name: string) => ({
-          username: name,
+        users: responseData.map((user: { id: string; username: string }) => ({
+          userId: user.id,
+          username: user.username,
           permissionGroupId: data.permissionGroupId,
         })),
       },
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserAndAccessManagementServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserAndAccessManagementServiceCEImpl.java
index 4d4c963f71..67f6a22599 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserAndAccessManagementServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/UserAndAccessManagementServiceCEImpl.java
@@ -25,10 +25,11 @@ import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static java.lang.Boolean.TRUE;
@@ -97,7 +98,7 @@ public class UserAndAccessManagementServiceCEImpl implements UserAndAccessManage
             return Mono.error(new AppsmithException(AppsmithError.INVALID_PARAMETER, FieldName.ROLE));
         }
 
-        List<String> usernames = new ArrayList<>();
+        Set<String> usernames = new HashSet<>();
         for (String username : originalUsernames) {
             usernames.add(username.toLowerCase());
         }
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
index 4c7e148cf4..2aeb50a519 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/WorkspaceServiceTest.java
@@ -1840,4 +1840,32 @@ public class WorkspaceServiceTest {
                 mongoTemplate.count(queryWorkspaceWithAdditionalField, Workspace.class);
         assertThat(countWorkspaceWithAdditionalFieldAfterUpdate).isEqualTo(1);
     }
+
+    @Test
+    @WithUserDetails(value = "api_user")
+    void testInviteDuplicateUsers_shouldReturnUniqueUsers() {
+        String testName = "test";
+        List<String> duplicateUsernames = List.of(testName + "user@test.com", testName + "user@test.com");
+        Workspace createdWorkspace = workspaceService.create(workspace).block();
+        assertThat(createdWorkspace).isNotNull();
+        assertThat(createdWorkspace.getDefaultPermissionGroups()).isNotEmpty();
+        List<PermissionGroup> defaultWorkspaceRoles = permissionGroupRepository
+                .findAllById(createdWorkspace.getDefaultPermissionGroups())
+                .collectList()
+                .block();
+        assertThat(defaultWorkspaceRoles)
+                .hasSize(createdWorkspace.getDefaultPermissionGroups().size());
+
+        InviteUsersDTO inviteUsersDTO = new InviteUsersDTO();
+        inviteUsersDTO.setUsernames(duplicateUsernames);
+        inviteUsersDTO.setPermissionGroupId(defaultWorkspaceRoles.get(0).getId());
+
+        // Invited users list contains duplicate users.
+        List<User> userList = userAndAccessManagementService
+                .inviteUsers(inviteUsersDTO, "test")
+                .block();
+        assertThat(userList).hasSize(1);
+        User invitedUser = userList.get(0);
+        assertThat(invitedUser.getUsername()).isEqualTo(testName + "user@test.com");
+    }
 }