diff --git a/Pipfile b/Pipfile
index 522d3b48f..3d37cf19e 100644
--- a/Pipfile
+++ b/Pipfile
@@ -18,7 +18,7 @@ gunicorn = {version = "==20.1.0", extras = ["eventlet"], ref = "1299ea9e967a61ae
 humanize = "~=4.1"
 itsdangerous = "~=2.1"
 jinja2 = "~=3.1"
-notifications-python-client = "==6.3.0"
+notifications-python-client = "==8.0.1"
 prometheus-client = "==0.14.1"
 pyexcel = "==0.7.0"
 pyexcel-io = "==0.6.6"
diff --git a/Pipfile.lock b/Pipfile.lock
index 3d3c2add5..d5c0fd75d 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "1200040313f4ef8098f45570bcff01af1ca883f7fb905d1821faffa8757c21fb"
+            "sha256": "82d316c857618773d26fcaaf832ad52ff7d4a0871fbedc13feba12f2445d4c89"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -757,10 +757,10 @@
         },
         "notifications-python-client": {
             "hashes": [
-                "sha256:47c803fcc8b4098d069b92547bb52607b558cec25c19e2697a74faab2e5ef4c0"
+                "sha256:e89f5ad7caf17065ede88a1c2270c32cc24de75843856e524a2336f952260b4c"
             ],
             "index": "pypi",
-            "version": "==6.3.0"
+            "version": "==8.0.1"
         },
         "notifications-utils": {
             "editable": true,
@@ -933,7 +933,7 @@
                 "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
                 "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==2.8.2"
         },
         "python-dotenv": {
@@ -1095,7 +1095,7 @@
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
                 "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==1.16.0"
         },
         "smartypants": {
@@ -1865,7 +1865,7 @@
                 "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86",
                 "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==2.8.2"
         },
         "pyyaml": {
@@ -1959,7 +1959,7 @@
                 "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926",
                 "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==1.16.0"
         },
         "smmap": {
@@ -1998,7 +1998,7 @@
                 "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b",
                 "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"
             ],
-            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'",
             "version": "==0.10.2"
         },
         "tomli": {
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 1a591b60d..1b5450289 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -11,7 +11,7 @@
 
 {% block backLink %}
   {{ govukBackLink({
-    "href": url_for('main.view_template', service_id=current_service.id, template_id=template.id) if template else url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id)
+    "href": url_for('main.choose_template', service_id=current_service.id, template_folder_id=template_folder_id) if template_folder_id else url_for('main.choose_template', service_id=current_service.id)
   }) }}
 {% endblock %}