diff --git a/app/portainer/views/teams/edit/teamController.js b/app/portainer/views/teams/edit/teamController.js
index f07054607..a82b6280a 100644
--- a/app/portainer/views/teams/edit/teamController.js
+++ b/app/portainer/views/teams/edit/teamController.js
@@ -112,6 +112,7 @@ function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMember
     .then(function success() {
       $scope.users = $scope.users.concat($scope.teamMembers);
       $scope.teamMembers = [];
+      $scope.leaderCount = 0;
       Notifications.success('All users successfully removed');
     })
     .catch(function error(err) {
@@ -123,6 +124,9 @@ function ($q, $scope, $state, $transition$, TeamService, UserService, TeamMember
     TeamMembershipService.deleteMembership(user.MembershipId)
     .then(function success() {
       removeUserFromArray(user.Id, $scope.teamMembers);
+      if (user.TeamRole === 'Leader') {
+        $scope.leaderCount--;
+      }
       $scope.users.push(user);
       Notifications.success('User removed from team', user.Username);
     })