diff --git a/app/templates/views/jobs/jobs.html b/app/templates/views/jobs/jobs.html
index 341ebe4b9..29155f853 100644
--- a/app/templates/views/jobs/jobs.html
+++ b/app/templates/views/jobs/jobs.html
@@ -9,15 +9,15 @@
 
     <h1 class="heading-large">Notifications activity</h1>
     <p>
-      <a href="{{ url_for(".view_notifications", service_id=service_id, job_id=job_id, page=1) }}">All messages</a>
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, job_id=job_id, page=1) }}">All messages</a>
     </p>
     <p>
-      <a href="{{ url_for(".view_notifications", service_id=service_id, job_id=job_id, type="sms", page=1) }}">Text messages</a>&emsp;
-      <a href="{{ url_for(".view_notifications", service_id=service_id, job_id=job_id, type="email", page=1) }}">Email messages</a>
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, job_id=job_id, type="sms", page=1) }}">Text messages</a>&emsp;
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, job_id=job_id, type="email", page=1) }}">Email messages</a>
     </p>
     <p>
-      <a href="{{ url_for(".view_notifications", service_id=service_id, job_id=job_id, status=['sent', 'delivered'], page=1) }}">Successful messages</a>&emsp;
-      <a href="{{ url_for(".view_notifications", service_id=service_id, job_id=job_id, status=['failed', 'complaint', 'bounce'], page=1) }}">Failed messages</a>
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, job_id=job_id, status=['sent', 'delivered'], page=1) }}">Successful messages</a>&emsp;
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, job_id=job_id, status=['failed', 'complaint', 'bounce'], page=1) }}">Failed messages</a>
     </p>
     {% call(item) list_table(
       jobs,
diff --git a/app/templates/views/notifications.html b/app/templates/views/notifications.html
index 6165b0508..f74ea97c4 100644
--- a/app/templates/views/notifications.html
+++ b/app/templates/views/notifications.html
@@ -10,15 +10,15 @@
 
     <h1 class="heading-large">Notifications activity</h1>
     <p>
-      <a href="{{ url_for(".view_notifications", service_id=service_id, page=1) }}">All messages</a>
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, page=1) }}">All messages</a>
     </p>
     <p>
-      <a href="{{ url_for(".view_notifications", service_id=service_id, type="sms", page=1) }}">Text messages</a>&emsp;
-      <a href="{{ url_for(".view_notifications", service_id=service_id, type="email", page=1) }}">Email messages</a>
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, type="sms", page=1) }}">Text messages</a>&emsp;
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, type="email", page=1) }}">Email messages</a>
     </p>
     <p>
-      <a href="{{ url_for(".view_notifications", service_id=service_id, status=['sent', 'delivered'], page=1) }}">Successful messages</a>&emsp;
-      <a href="{{ url_for(".view_notifications", service_id=service_id, status=['failed', 'complaint', 'bounce'], page=1) }}">Failed messages</a>
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, status=['sent', 'delivered'], page=1) }}">Successful messages</a>&emsp;
+      <a href="{{ url_for(".view_notifications", service_id=current_service.id, status=['failed', 'complaint', 'bounce'], page=1) }}">Failed messages</a>
     </p>
     {% call(item) list_table(
       notifications,