diff --git a/app/models/concerns/permission_checkable_model.rb b/app/models/concerns/permission_checkable_model.rb
index f528f4e0e..fe430be7d 100644
--- a/app/models/concerns/permission_checkable_model.rb
+++ b/app/models/concerns/permission_checkable_model.rb
@@ -25,10 +25,11 @@ module PermissionCheckableModel
   def load_user_role_permissions(user)
     if user_assignments.loaded?
       user_assignments.detect do |user_assignment|
-        user_assignment.user == user && user_assignment.team == user.current_team
+        user_assignment.user == user && (is_a?(Team) || user_assignment.team == user.current_team)
       end&.user_role&.permissions
     else
-      user_assignments.find_by(user: user, team: user.current_team)&.user_role&.permissions
+      load_criteria = is_a?(Team) ? { user: user } : { user: user, team: user.current_team }
+      user_assignments.find_by(load_criteria)&.user_role&.permissions
     end
   end
 end