diff --git a/app/portainer/settings/edge-compute/SettingsEdgeCompute/SettingsEdgeCompute.tsx b/app/portainer/settings/edge-compute/SettingsEdgeCompute/SettingsEdgeCompute.tsx
index 6838214af..377ae6791 100644
--- a/app/portainer/settings/edge-compute/SettingsEdgeCompute/SettingsEdgeCompute.tsx
+++ b/app/portainer/settings/edge-compute/SettingsEdgeCompute/SettingsEdgeCompute.tsx
@@ -118,7 +118,7 @@ export function SettingsEdgeCompute({ settings, onSubmit }: Props) {
 
                 <FormControl
                   inputId="edge_enforce_id"
-                  label="Enforce environment ID"
+                  label="Enforce use of Portainer generated Edge ID’s"
                   size="medium"
                   errors={errors.EnforceEdgeID}
                 >
@@ -133,23 +133,6 @@ export function SettingsEdgeCompute({ settings, onSubmit }: Props) {
                   />
                 </FormControl>
 
-                <FormControl
-                  inputId="edge_tofc"
-                  label="Trust on first connect"
-                  size="medium"
-                  errors={errors.DisableTrustOnFirstConnect}
-                >
-                  <Switch
-                    id="edge_disable_tofc"
-                    name="edge_disable_tofc"
-                    className="space-right"
-                    checked={!values.DisableTrustOnFirstConnect}
-                    onChange={(e) =>
-                      setFieldValue('DisableTrustOnFirstConnect', !e.valueOf())
-                    }
-                  />
-                </FormControl>
-
                 <div className="form-group">
                   <div className="col-sm-12">
                     <LoadingButton