diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
index dc1acea680c235..79a6370b4be46a 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
@@ -86,17 +86,6 @@ export function AgentConfigurationCreateEdit({
     setNewConfig(getInitialNewConfig(existingConfig));
   }, [existingConfig]);
 
-  useEffect(
-    () => {
-      // cleanup settings when navigating to "choose-settings-step" to not save invalid configurations
-      if (pageStep === 'choose-settings-step' && !isEditMode) {
-        setNewConfig({ ...newConfig, settings: {} });
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [pageStep]
-  );
-
   useEffect(() => {
     // the user tried to edit the service of an existing config
     if (pageStep === 'choose-service-step' && isEditMode) {
@@ -143,7 +132,10 @@ export function AgentConfigurationCreateEdit({
         <ServicePage
           newConfig={newConfig}
           setNewConfig={setNewConfig}
-          onClickNext={() => setPage('choose-settings-step')}
+          onClickNext={() => {
+            resetSettings();
+            setPage('choose-settings-step');
+          }}
         />
       )}