diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts
index 737eeeb..49113a8 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts
@@ -172,10 +172,24 @@ export class UserAssignmentComponent extends BasePageComponent implements OnInit
     }
   }
 
+  //unselection case
+  private sUnassgnCount = 0;
+  private sAssgnCount = 0;
+
   unassignedUsersOnSelectedRows = (rows: GuiSelectedRow[]) => {
+    if(rows.length > this.sUnassgnCount && this.unassignedUsers.selectedRows.length > 0){
+      this.assignedUsers.safelyUnselectAll()
+    }
+    
+    this.sUnassgnCount = rows.length;
   }
 
   assignedUsersOnSelectedRows = (rows: GuiSelectedRow[]) => {
+    if(rows.length > this.sAssgnCount && this.assignedUsers.selectedRows.length > 0){
+      this.unassignedUsers.safelyUnselectAll()
+    }
+    
+    this.sAssgnCount = rows.length;
   }
 }