diff --git a/application/views/components/custom_fields.php b/application/views/components/custom_fields.php
index 809f4e7e..c5b1350f 100644
--- a/application/views/components/custom_fields.php
+++ b/application/views/components/custom_fields.php
@@ -12,12 +12,12 @@ $disabled = $disabled ?? false; ?>
         <div class="mb-3">
             <label for="custom-field-<?= $i ?>" class="form-label">
                 <?= setting('label_custom_field_' . $i) ?: lang('custom_field') . ' #' . $i ?>
-                <?php if (vars('require_custom_field_' . $i)): ?>
-                    <span class="text-danger" hidden>*</span>
+                <?php if (setting('require_custom_field_' . $i)): ?>
+                    <span class="text-danger" <?= $disabled ? 'hidden' : '' ?>>*</span>
                 <?php endif; ?>
             </label>
             <input type="text" id="custom-field-<?= $i ?>"
-                   class="<?= vars('require_custom_field_' . $i) ? 'required' : '' ?> form-control"
+                   class="<?= setting('require_custom_field_' . $i) ? 'required' : '' ?> form-control"
                    maxlength="120" <?= $disabled ? 'disabled' : '' ?>/>
         </div>
     <?php endif; ?>