diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py
index 2a10620d..d1e2e95c 100644
--- a/taiga/projects/tasks/api.py
+++ b/taiga/projects/tasks/api.py
@@ -258,7 +258,6 @@ class TaskViewSet(OCCResourceMixin, VotedResourceMixin, HistoryResourceMixin, Wa
 
         return response.Ok(tasks_serialized.data)
 
-
     def _bulk_update_order(self, order_field, request, **kwargs):
         validator = validators.UpdateTasksOrderBulkValidator(data=request.DATA)
         if not validator.is_valid():
diff --git a/taiga/projects/tasks/signals.py b/taiga/projects/tasks/signals.py
index 4b9f7af1..dfb698e5 100644
--- a/taiga/projects/tasks/signals.py
+++ b/taiga/projects/tasks/signals.py
@@ -39,6 +39,7 @@ def try_to_close_or_open_us_and_milestone_when_create_or_edit_task(sender, insta
     _try_to_close_or_open_us_when_create_or_edit_task(instance)
     _try_to_close_or_open_milestone_when_create_or_edit_task(instance)
 
+
 def try_to_close_or_open_us_and_milestone_when_delete_task(sender, instance, **kwargs):
     _try_to_close_or_open_us_when_delete_task(instance)
     _try_to_close_milestone_when_delete_task(instance)
@@ -96,6 +97,7 @@ def _try_to_close_milestone_when_delete_task(instance):
         if instance.milestone_id and services.calculate_milestone_is_closed(instance.milestone):
             services.close_milestone(instance.milestone)
 
+
 ####################################
 # Signals for set finished date
 ####################################
diff --git a/taiga/projects/userstories/signals.py b/taiga/projects/userstories/signals.py
index fc1fdacc..ba643b61 100644
--- a/taiga/projects/userstories/signals.py
+++ b/taiga/projects/userstories/signals.py
@@ -59,8 +59,9 @@ def update_role_points_when_create_or_edit_us(sender, instance, **kwargs):
 
 def update_milestone_of_tasks_when_edit_us(sender, instance, created, **kwargs):
     if not created:
-        instance.tasks.exclude(milestone=instance.milestone).update(milestone=instance.milestone)
-        for task in instance.tasks.all():
+        tasks = instance.tasks.exclude(milestone=instance.milestone)
+        tasks.update(milestone=instance.milestone)
+        for task in tasks:
             take_snapshot(task)