diff --git a/app/templates/components/api-key.html b/app/templates/components/api-key.html
index adb3ece3e..57df093a9 100644
--- a/app/templates/components/api-key.html
+++ b/app/templates/components/api-key.html
@@ -1,11 +1,13 @@
-{% macro api_key(key, name, thing="API key", heading=True) %}
-  {% if heading %}
+{% macro api_key(key, name, thing="API key") %}
+  {% if name == thing %}
     <h2 class="api-key__name">
       {{ name }}
     </h2>
   {% endif %}
-  <div data-module="api-key" data-key="{{ key }}" data-thing="{{ thing }}"{% if not heading %}data-name="{{ name }}"{% endif %}>
-    <span class="api-key__key"><span class="govuk-visually-hidden">{{ thing }}: </span>{{ key }}</span>
+  <div data-module="api-key" data-key="{{ key }}" data-thing="{{ thing }}" data-name="{{ name }}">
+    <span class="api-key__key">
+      {% if name != thing %}<span class="govuk-visually-hidden">{{ thing }}: </span>{% endif %}{{ key }}
+    </span>
     <span class="api-key__notice" aria-live="assertive"></span>
   </div>
 {% endmacro %}