diff --git a/app/controllers/access_permissions/base_controller.rb b/app/controllers/access_permissions/base_controller.rb
index 922f47976..5495d6c00 100644
--- a/app/controllers/access_permissions/base_controller.rb
+++ b/app/controllers/access_permissions/base_controller.rb
@@ -108,7 +108,7 @@ module AccessPermissions
     end
 
     def show_user_group_assignments
-      render json: @model.user_group_assignments.includes(:user_role, :user_group).order('user_groups.name ASC'),
+      render json: @model.user_group_assignments.where(team: current_team).includes(:user_role, :user_group).order('user_groups.name ASC'),
              each_serializer: UserGroupAssignmentSerializer, user: current_user
     end
 
diff --git a/app/serializers/lists/repository_serializer.rb b/app/serializers/lists/repository_serializer.rb
index ca88aee3c..47b2f6724 100644
--- a/app/serializers/lists/repository_serializer.rb
+++ b/app/serializers/lists/repository_serializer.rb
@@ -58,7 +58,7 @@ module Lists
         show_access: access_permissions_repository_path(object),
         share: team_shared_objects_path(current_user.current_team, object_id: object.id, object_type: 'Repository'),
         user_roles: user_roles_access_permissions_repository_path(object),
-        user_group_members: users_users_settings_team_user_groups_path(team_id: object.team.id)
+        user_group_members: users_users_settings_team_user_groups_path(team_id: current_user.current_team_id)
       }
 
       urls[:show] = repository_path(object) if can_read?