diff --git a/taiga/projects/milestones/models.py b/taiga/projects/milestones/models.py
index 0c7161d1..684a62ff 100644
--- a/taiga/projects/milestones/models.py
+++ b/taiga/projects/milestones/models.py
@@ -72,7 +72,7 @@ class Milestone(WatchedModelMixin, models.Model):
         super().save(*args, **kwargs)
 
     def _get_user_stories_points(self, user_stories):
-        role_points = [us.role_points.all() for us in user_stories]
+        role_points = [us.role_points.all().select_related('points') for us in user_stories]
         flat_role_points = itertools.chain(*role_points)
         flat_role_dicts = map(lambda x: {x.role_id: x.points.value if x.points.value else 0}, flat_role_points)
         return dict_sum(*flat_role_dicts)
diff --git a/taiga/projects/models.py b/taiga/projects/models.py
index 0ccd51ca..766fcfdf 100644
--- a/taiga/projects/models.py
+++ b/taiga/projects/models.py
@@ -237,7 +237,7 @@ class Project(ProjectDefaults, TaggedMixin, models.Model):
         rp_query.delete()
 
     def _get_user_stories_points(self, user_stories):
-        role_points = [us.role_points.all() for us in user_stories]
+        role_points = [us.role_points.all().select_related('points') for us in user_stories]
         flat_role_points = itertools.chain(*role_points)
         flat_role_dicts = map(lambda x: {x.role_id: x.points.value if x.points.value else 0}, flat_role_points)
         return dict_sum(*flat_role_dicts)