diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CrlController.php b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CrlController.php
index 64e2c904cdf..531e42bef83 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CrlController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Trust/Api/CrlController.php
@@ -46,7 +46,7 @@ class CrlController extends ApiControllerBase
         '3' => 'affiliationChanged',
         '4' => 'superseded',
         '5' => 'cessationOfOperation',
-        '6' => 'certificateHold'
+        '6' => 'certificateHold',
     ];
 
     public function searchAction()
@@ -120,7 +120,7 @@ public function getAction($caref)
                         'selected' => $crlmethod == 'existing' ? '1' : '0'
                     ],
                 ];
-                for ($i = 0; $i <= 6; $i++) {
+                for ($i = 0; $i < count($status_codes); $i++) {
                     $code = (string)$i;
                     $result['revoked_reason_' . $code] = [];
                     foreach ($certs as $ref => $data) {
@@ -169,7 +169,7 @@ public function setAction($caref)
                 return ['status' => 'failed', 'validations' => $validations];
             } else {
                 $revoked_refs = [];
-                for ($i = 0; $i <= 6; $i++) {
+                for ($i = 0; $i <= count($status_codes); $i++) {
                     $fieldname = 'revoked_reason_' . (string)$i;
                     foreach (explode(',', $payload[$fieldname] ?? '') as $refid) {
                         if (!empty($refid)) {