diff --git a/net/haproxy/pkg-descr b/net/haproxy/pkg-descr
index 3679ae30d..70a373278 100644
--- a/net/haproxy/pkg-descr
+++ b/net/haproxy/pkg-descr
@@ -28,6 +28,9 @@ Added:
 * add support for SSL SNI expression to servers (#3756)
 * add column "mode" to servers overview (#4632)
 
+Fixed:
+* Maintenance tab "SSL Certificates" not working with only one cert
+
 Changed:
 * upgrade to HAProxy 3.2 release series (#5147)
 * refactor http/tcp rules to make extensions easier
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml
index 2f7d7a4ee..b805cb1c8 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/sslCerts.yaml
@@ -8,14 +8,14 @@
 {# ################## #}
 {%  macro getCA(refId) -%}
 {%    set result = '{}' %}
-{%    for data in helpers.getNodeByTag('ca') if data.refid == refId %}
+{%    for data in helpers.toList('ca') if data.refid == refId %}
 {{      data.crt -}}
 {%    else %}
 {{     "{}" }}
 {%    endfor %}
 {%- endmacro %}
 {%  macro getCert(refId, indent=4) -%}
-{%    for data in helpers.getNodeByTag('cert') if data.refid == refId %}
+{%    for data in helpers.toList('cert') if data.refid == refId %}
 {%      if data.caref %}
 {%        do data.update({'ca': getCA(data.caref)}) %}
 {%      else %}