diff --git a/application/forms/Config/General/CspConfigForm.php b/application/forms/Config/General/CspConfigForm.php
index f98498794..2ba477d95 100644
--- a/application/forms/Config/General/CspConfigForm.php
+++ b/application/forms/Config/General/CspConfigForm.php
@@ -43,7 +43,10 @@ class CspConfigForm extends CompatForm
             ],
         );
 
-        if ($this->getValue('use_strict_csp') === 'y') {
+        if ($this->getValue('use_strict_csp') !== 'y') {
+            $this->addElement('hidden', 'use_custom_csp');
+            $this->addElement('hidden', 'custom_csp');
+        } else {
             $this->addElement(
                 'checkbox',
                 'use_custom_csp',