diff --git a/src/app/Http/Controllers/Admin/CertificateTemplateController.php b/src/app/Http/Controllers/Admin/CertificateTemplateController.php
index 05d9f32..6e640a9 100644
--- a/src/app/Http/Controllers/Admin/CertificateTemplateController.php
+++ b/src/app/Http/Controllers/Admin/CertificateTemplateController.php
@@ -60,9 +60,15 @@ class CertificateTemplateController extends Controller
             'fields.*.align'          => 'required|in:left,center,right',
         ]);
 
-        $config = $template->config_json ?? [];
-        $config['fields'] = array_merge($config['fields'] ?? [], $request->fields);
+        $config  = $template->config_json ?? [];
+        $merged  = array_merge($config['fields'] ?? [], $request->fields);
 
+        // Kalau toggle No. Sijil dimatikan, buang dari config
+        if (! $request->boolean('show_cert_no')) {
+            unset($merged['certificate_no']);
+        }
+
+        $config['fields'] = $merged;
         $template->update(['config_json' => $config]);
 
         return redirect()->route('admin.programs.template.show', $program)
diff --git a/src/resources/views/admin/programs/template/show.blade.php b/src/resources/views/admin/programs/template/show.blade.php
index 41f4f5f..952cdb0 100644
--- a/src/resources/views/admin/programs/template/show.blade.php
+++ b/src/resources/views/admin/programs/template/show.blade.php
@@ -198,6 +198,8 @@
                         <div class="card-header py-2 bg-light d-flex justify-content-between align-items-center">
                             <span class="fw-medium small">No. Sijil <span class="text-muted">(Pilihan)</span></span>
                             <div class="form-check form-switch mb-0">
+                                <input type="hidden" name="show_cert_no" id="showCertNoHidden"
+                                       value="{{ isset($fields['certificate_no']) ? '1' : '0' }}">
                                 <input class="form-check-input" type="checkbox" id="showCertNo"
                                        onchange="toggleCertNo(this)"
                                        {{ isset($fields['certificate_no']) ? 'checked' : '' }}>
@@ -354,6 +356,7 @@ function previewImage(input) {
 // ── Toggle No. Sijil ──────────────────────────────────────────────────────────
 function toggleCertNo(cb) {
     document.getElementById('certNoFields').style.display = cb.checked ? '' : 'none';
+    document.getElementById('showCertNoHidden').value = cb.checked ? '1' : '0';
 }
 
 // ── Toggle panduan (ikon chevron) ─────────────────────────────────────────────