diff --git a/django_project/event_mapper/tasks/daily_report.py b/django_project/event_mapper/tasks/daily_report.py
index 4850f146..2f4a6fe8 100644
--- a/django_project/event_mapper/tasks/daily_report.py
+++ b/django_project/event_mapper/tasks/daily_report.py
@@ -64,6 +64,11 @@ def daily_report():
         report += 'No movement updated found in these period.\n'
 
     logger.info(report)
+
+    # Do not send email notification if no events or movement updates
+    if len(events) == 0 and len(movements) == 0:
+        return
+
     # Send email to all user
     users = User.objects.all()
     for user in users:
diff --git a/django_project/event_mapper/tasks/movement_notify_all_user.py b/django_project/event_mapper/tasks/movement_notify_all_user.py
index 3ccc6b2d..d319bb61 100644
--- a/django_project/event_mapper/tasks/movement_notify_all_user.py
+++ b/django_project/event_mapper/tasks/movement_notify_all_user.py
@@ -25,7 +25,7 @@ def movement_notify_all_users(movement_id):
     movement = Movement.objects.get(id=movement_id)
     users = User.objects.filter(
         countries_notified__polygon_geometry__contains=
-        movement.boundary.polygon_geometry, notify_immediately=True)
+        movement.boundary.polygon_geometry)
 
     message = movement.report()
 
diff --git a/django_project/event_mapper/tasks/movement_notify_priority_user.py b/django_project/event_mapper/tasks/movement_notify_priority_user.py
index 93495251..51fe5d71 100644
--- a/django_project/event_mapper/tasks/movement_notify_priority_user.py
+++ b/django_project/event_mapper/tasks/movement_notify_priority_user.py
@@ -25,7 +25,8 @@ def movement_notify_priority_users(movement_id):
     movement = Movement.objects.get(id=movement_id)
     users = User.objects.filter(
         countries_notified__polygon_geometry__contains=
-        movement.boundary.polygon_geometry)
+        movement.boundary.polygon_geometry,
+        notify_immediately=True)
 
     message = movement.report()