diff --git a/app/service/rest.py b/app/service/rest.py
index 5a80cdc76..a6adebdd2 100644
--- a/app/service/rest.py
+++ b/app/service/rest.py
@@ -219,7 +219,8 @@ def get_all_notifications_for_service(service_id):
         filter_dict=data,
         page=page,
         page_size=page_size,
-        limit_days=limit_days)
+        limit_days=limit_days,
+        include_jobs=True)
     kwargs = request.args.to_dict()
     kwargs['service_id'] = service_id
     return jsonify(
diff --git a/tests/app/service/test_rest.py b/tests/app/service/test_rest.py
index ba6587a61..6355520e4 100644
--- a/tests/app/service/test_rest.py
+++ b/tests/app/service/test_rest.py
@@ -14,8 +14,8 @@ from tests.app.conftest import (
     sample_service as create_sample_service,
     sample_service_permission as create_sample_service_permission,
     sample_user as create_sample_user,
-    sample_notification as create_sample_notification
-)
+    sample_notification as create_sample_notification,
+    sample_notification_with_job)
 
 
 def test_get_service_list(notify_api, service_factory):
@@ -1037,6 +1037,28 @@ def test_get_all_notifications_for_service_in_order(notify_api, notify_db, notif
         assert response.status_code == 200
 
 
+def test_get_all_notifications_for_service_including_ones_made_by_jobs(
+        notify_api,
+        notify_db,
+        notify_db_session,
+        sample_service):
+    with notify_api.test_request_context(), notify_api.test_client() as client:
+        with_job = sample_notification_with_job(notify_db, notify_db_session, service=sample_service)
+        without_job = create_sample_notification(notify_db, notify_db_session, service=sample_service)
+
+        auth_header = create_authorization_header()
+
+        response = client.get(
+            path='/service/{}/notifications'.format(sample_service.id),
+            headers=[auth_header])
+
+        resp = json.loads(response.get_data(as_text=True))
+        assert len(resp['notifications']) == 2
+        assert resp['notifications'][0]['to'] == with_job.to
+        assert resp['notifications'][1]['to'] == without_job.to
+        assert response.status_code == 200
+
+
 def test_set_sms_sender_for_service(notify_api, sample_service):
     with notify_api.test_request_context():
         with notify_api.test_client() as client: