diff --git a/dojo/engagement/views.py b/dojo/engagement/views.py
index 7ae3e758ead..7bde94ae338 100644
--- a/dojo/engagement/views.py
+++ b/dojo/engagement/views.py
@@ -974,7 +974,7 @@ def process_form(
             "apply_tags_to_endpoints": form.cleaned_data.get("apply_tags_to_endpoints", False),
             "close_old_findings_product_scope": form.cleaned_data.get("close_old_findings_product_scope", None),
             "group_by": form.cleaned_data.get("group_by", None),
-            "create_finding_groups_for_all_findings": form.cleaned_data.get("create_finding_groups_for_all_findings"),
+            "create_finding_groups_for_all_findings": form.cleaned_data.get("create_finding_groups_for_all_findings", None),
             "environment": self.get_development_environment(environment_name=form.cleaned_data.get("environment")),
         })
         # Create the engagement if necessary
diff --git a/dojo/test/views.py b/dojo/test/views.py
index 06301d20813..ad98b4e17a9 100644
--- a/dojo/test/views.py
+++ b/dojo/test/views.py
@@ -915,7 +915,7 @@ def process_form(
             "apply_tags_to_endpoints": form.cleaned_data.get("apply_tags_to_endpoints", False),
             "group_by": form.cleaned_data.get("group_by", None),
             "close_old_findings": form.cleaned_data.get("close_old_findings", None),
-            "create_finding_groups_for_all_findings": form.cleaned_data.get("create_finding_groups_for_all_findings"),
+            "create_finding_groups_for_all_findings": form.cleaned_data.get("create_finding_groups_for_all_findings", None),
         })
         # Override the form values of active and verified
         if activeChoice := form.cleaned_data.get("active", None):