diff --git a/idhub/templates/idhub/admin/issue_credentials.html b/idhub/templates/idhub/admin/issue_credentials.html
index d7d6092..7497808 100644
--- a/idhub/templates/idhub/admin/issue_credentials.html
+++ b/idhub/templates/idhub/admin/issue_credentials.html
@@ -46,11 +46,13 @@
         {{ object.get_status}}
       </div>
     </div>
+    {% if object.issued_on %}
     <div class="row mt-3">
       <div class="col text-center">
         <a class="btn btn-green-admin" href="{% url 'idhub:admin_credential_json' object.id %}">{% trans 'View in JSON format' %}</a>
       </div>
     </div>
+    {% endif %}
   </div>
 </div>
 <!-- Modal Revoke -->
diff --git a/idhub/templates/idhub/user/credential.html b/idhub/templates/idhub/user/credential.html
index 415c280..b78e81b 100644
--- a/idhub/templates/idhub/user/credential.html
+++ b/idhub/templates/idhub/user/credential.html
@@ -38,6 +38,7 @@
     </div>
   </div>
 </div>
+  {% if object.issued_on %}
 <div class="row mt-3">
   {% if object.eidas1_did and admin_validated %}
   <div class="col text-center">
@@ -47,5 +48,6 @@
   <div class="col text-center">
     <a class="btn btn-green-user" href="{% url 'idhub:user_credential_json' object.id %}">{% trans 'View credential in JSON format' %}</a>
   </div>
+  {% endif %}
 </div>
 {% endblock %}