diff --git a/templates/pages/consent.html b/templates/pages/consent.html
index cd0ee2d59..c66e9c8a6 100644
--- a/templates/pages/consent.html
+++ b/templates/pages/consent.html
@@ -27,7 +27,7 @@ Please see LICENSE files in the repository root for full details.
         {{ _('mas.consent.continue_to', client_name=client_name) }}
       </h1>
       <p class="text [&>span]:whitespace-nowrap [&>span]:text-[var(--cpd-color-text-link-external)]">
-        {{ _("mas.consent.this_will_setup", client_name=client_name, client_uri=(client.client_uri | simplify_url), server_name=branding.server_name) }}
+        {{ _("mas.consent.this_will_setup", client_name=client_name, client_uri=((client.client_uri or grant.redirect_uri) | simplify_url), server_name=branding.server_name) }}
       </p>
     </div>
   </header>
diff --git a/templates/pages/device_consent.html b/templates/pages/device_consent.html
index 5433cadcf..23d56835d 100644
--- a/templates/pages/device_consent.html
+++ b/templates/pages/device_consent.html
@@ -30,7 +30,7 @@ Please see LICENSE files in the repository root for full details.
         </h1>
 
         <p class="text [&>span]:whitespace-nowrap [&>span]:text-[var(--cpd-color-text-link-external)]">
-          {{ _("mas.device_consent.this_will_setup", client_name=client_name, client_uri=(client.client_uri | simplify_url), server_name=branding.server_name) }}
+          {{ _("mas.device_consent.this_will_setup", client_name=client_name, client_uri=((client.client_uri or "") | simplify_url), server_name=branding.server_name) }}
         </p>
 
         <div class="session-card mt-4">
diff --git a/translations/en.json b/translations/en.json
index 2406b395a..be553656a 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -197,7 +197,7 @@
       },
       "this_will_setup": "This will set up %(client_name)s (<span>%(client_uri)s</span>) with your <span>%(server_name)s</span> account.",
       "@this_will_setup": {
-        "context": "pages/consent.html:30:11-149"
+        "context": "pages/consent.html:30:11-173"
       },
       "use_another_account": "Use another account",
       "@use_another_account": {
@@ -255,7 +255,7 @@
       },
       "this_will_setup": "Another device wants to set up %(client_name)s (<span>%(client_uri)s</span>) with your <span>%(server_name)s</span> account. Make sure you recognise that device.",
       "@this_will_setup": {
-        "context": "pages/device_consent.html:33:13-158"
+        "context": "pages/device_consent.html:33:13-166"
       }
     },
     "device_display_name": {