diff --git a/templates/Sparkle/ssl_certificates/certs_cert.tpl b/templates/Sparkle/ssl_certificates/certs_cert.tpl
index e383f54f..f0755efc 100644
--- a/templates/Sparkle/ssl_certificates/certs_cert.tpl
+++ b/templates/Sparkle/ssl_certificates/certs_cert.tpl
@@ -8,7 +8,7 @@
 		<if !empty($san_list)><br>SAN: {$san_list}</if>
 	</td>
 	<td>
-		{$cert_data['issuer']['O']}
+		<if isset($cert_data['issuer']['O']) && !empty($cert_data['issuer']['O'])>{$cert_data['issuer']['O']}</if>
 	</td>
 	<td>
 		{$validFrom}