diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 108281368..be94cbfe7 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -79,7 +79,11 @@ def view_job(service_id, job_id):
     finished = job['status'] == 'finished'
     if 'download' in request.args and request.args['download'] == 'csv':
         csv_content = generate_notifications_csv(
-            notification_api_client.get_notifications_for_service(service_id, job_id)['notifications'])
+            notification_api_client.get_notifications_for_service(
+                service_id,
+                job_id,
+                page_size=job['notification_count']
+            )['notifications'])
         return csv_content, 200, {
             'Content-Type': 'text/csv; charset=utf-8',
             'Content-Disposition': 'inline; filename="{} - {}.csv"'.format(
diff --git a/app/utils.py b/app/utils.py
index 11d833250..e24fcef7e 100644
--- a/app/utils.py
+++ b/app/utils.py
@@ -98,9 +98,10 @@ def generate_notifications_csv(json_list):
     retval = None
     with content as csvfile:
         csvwriter = csv.writer(csvfile)
-        csvwriter.writerow(['Recipient', 'Template', 'Type', 'Job', 'Status', 'Time'])
+        csvwriter.writerow(['Row number', 'Recipient', 'Template', 'Type', 'Job', 'Status', 'Time'])
         for x in json_list:
             csvwriter.writerow([
+                int(x['job_row_number']) + 2 if 'job_row_number' in x and x['job_row_number'] else '',
                 x['to'],
                 x['template']['name'],
                 x['template']['template_type'],