diff --git a/app/assets/javascripts/users/settings/teams/show.js b/app/assets/javascripts/users/settings/teams/show.js
index d9a887b2a..cd213e4b6 100644
--- a/app/assets/javascripts/users/settings/teams/show.js
+++ b/app/assets/javascripts/users/settings/teams/show.js
@@ -150,7 +150,11 @@
             if (data.status === 'done') {
               // Reload the whole table
               HelperModule.flashAlertMsg(jobData.success_message, 'success');
-              usersDatatable.ajax.reload();
+              if(jobData.redirect_url) {
+                window.location.href = jobData.redirect_url;
+              } else {
+                usersDatatable.ajax.reload();
+              }
               animateSpinner(null, false);
               $('#destroy-user-team-modal').modal('hide');
               clearInterval(jobStatusInterval);
diff --git a/app/controllers/users/settings/user_teams_controller.rb b/app/controllers/users/settings/user_teams_controller.rb
index ebf1ccbe4..f316ee7a6 100644
--- a/app/controllers/users/settings/user_teams_controller.rb
+++ b/app/controllers/users/settings/user_teams_controller.rb
@@ -109,11 +109,13 @@ module Users
                               )
                             end
 
+          redirect_url = teams_path if params[:leave]
+
           generate_notification(current_user,
                                 @user_assignment.user,
                                 @user_assignment.assignable,
                                 false)
-          render json: { status: :ok, job_id: job_id, success_message: success_message }
+          render json: { status: :ok, job_id: job_id, success_message: success_message, redirect_url: redirect_url }
         end
       end