diff --git a/app/views/projects/commit/x509/_certificate_details.html.haml b/app/views/projects/commit/x509/_certificate_details.html.haml
index cea216d0d9dc0e2fe5575fb9b80f877b004df968..22d297248f813292d3923cffc5219e16b234ba8b 100644
--- a/app/views/projects/commit/x509/_certificate_details.html.haml
+++ b/app/views/projects/commit/x509/_certificate_details.html.haml
@@ -1,17 +1,18 @@
-.gpg-popover-certificate-details
-  %strong= _('Certificate Subject')
-  - if signature.x509_certificate.revoked?
-    %strong.cred= _('(revoked)')
-  %ul
-    - x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
-      %li= key + "=" + value
-    %li= _('Subject Key Identifier:')
-    %li.unstyled= signature.x509_certificate.subject_key_identifier.gsub(":", " ")
+- if signature.x509_certificate
+  .gpg-popover-certificate-details
+    %strong= _('Certificate Subject')
+    - if signature.x509_certificate.revoked?
+      %strong.cred= _('(revoked)')
+    %ul
+      - x509_subject(signature.x509_certificate.subject, ["CN", "O"]).map do |key, value|
+        %li= key + "=" + value
+      %li= _('Subject Key Identifier:')
+      %li.unstyled= signature.x509_certificate.subject_key_identifier.gsub(":", " ")
 
-.gpg-popover-certificate-details
-  %strong= _('Certificate Issuer')
-  %ul
-    - x509_subject(signature.x509_certificate.x509_issuer.subject, ["CN", "OU", "O"]).map do |key, value|
-      %li= key + "=" + value
-    %li= _('Subject Key Identifier:')
-    %li.unstyled= signature.x509_certificate.x509_issuer.subject_key_identifier.gsub(":", " ")
+  .gpg-popover-certificate-details
+    %strong= _('Certificate Issuer')
+    %ul
+      - x509_subject(signature.x509_certificate.x509_issuer.subject, ["CN", "OU", "O"]).map do |key, value|
+        %li= key + "=" + value
+      %li= _('Subject Key Identifier:')
+      %li.unstyled= signature.x509_certificate.x509_issuer.subject_key_identifier.gsub(":", " ")
diff --git a/spec/requests/projects/tags_controller_spec.rb b/spec/requests/projects/tags_controller_spec.rb
index c0b0b1728c28552462a48c4ea3cae712cfb22caa..97cc3a5a0df36d1cd398c5803be4f3ade7061a5f 100644
--- a/spec/requests/projects/tags_controller_spec.rb
+++ b/spec/requests/projects/tags_controller_spec.rb
@@ -24,4 +24,23 @@
       end
     end
   end
+
+  describe '#show' do
+    let_it_be(:project) { create(:project, :repository, :public) }
+    let_it_be(:user) { create(:user) }
+
+    before do
+      sign_in(user)
+    end
+
+    context 'with x509 signature' do
+      let(:tag_name) { 'v1.1.1' }
+
+      it 'displays a signature badge' do
+        get project_tags_path(project, id: tag_name)
+
+        expect(response.body).to include('Unverified')
+      end
+    end
+  end
 end