diff --git a/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.validation.ts b/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.validation.ts
index b1eee135a..c4461034b 100644
--- a/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.validation.ts
+++ b/app/react/portainer/settings/EdgeComputeView/EdgeComputeSettings/EdgeComputeSettings.validation.ts
@@ -9,8 +9,8 @@ import { FormValues } from './types';
 export function validationSchema(): SchemaOf<FormValues> {
   return object()
     .shape({
-      EnableEdgeComputeFeatures: boolean().required('This field is required.'),
-      EnforceEdgeID: boolean().required('This field is required.'),
+      EnableEdgeComputeFeatures: boolean().default(false),
+      EnforceEdgeID: boolean().default(false),
     })
     .concat(
       isBE