diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
index 9f3a65583ddb..23f688e66966 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
@@ -61,29 +61,38 @@ export function AgentConfigurationList({ status, data, refetch }: Props) {
         </h2>
       }
       body={
-        <>
-          <p>
-            {i18n.translate(
-              'xpack.apm.agentConfig.configTable.emptyPromptText',
-              {
-                defaultMessage:
-                  "Let's change that! You can fine-tune agent configuration directly from Kibana without having to redeploy. Get started by creating your first configuration.",
-              }
-            )}
-          </p>
-        </>
+        <p>
+          {i18n.translate('xpack.apm.agentConfig.configTable.emptyPromptText', {
+            defaultMessage:
+              "Let's change that! You can fine-tune agent configuration directly from Kibana without having to redeploy. Get started by creating your first configuration.",
+          })}
+        </p>
       }
       actions={
-        <EuiButton
-          color="primary"
-          fill
-          href={createAgentConfigurationHref(search, basePath)}
+        <EuiToolTip
+          content={
+            !canSave &&
+            i18n.translate(
+              'xpack.apm.settings.agentConfig.createConfigButton.tooltip',
+              {
+                defaultMessage:
+                  "You don't have permissions to create agent configurations",
+              }
+            )
+          }
         >
-          {i18n.translate(
-            'xpack.apm.agentConfig.configTable.createConfigButtonLabel',
-            { defaultMessage: 'Create configuration' }
-          )}
-        </EuiButton>
+          <EuiButton
+            color="primary"
+            fill
+            href={createAgentConfigurationHref(search, basePath)}
+            isDisabled={!canSave}
+          >
+            {i18n.translate(
+              'xpack.apm.agentConfig.configTable.createConfigButtonLabel',
+              { defaultMessage: 'Create configuration' }
+            )}
+          </EuiButton>
+        </EuiToolTip>
       }
     />
   );
diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
index ba08af32d65b..8c10b96c51ce 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
@@ -248,7 +248,7 @@ export function ApmIndices() {
                       fill
                       onClick={handleApplyChangesEvent}
                       isLoading={isSaving}
-                      disabled={!canSave}
+                      isDisabled={!canSave}
                     >
                       {i18n.translate(
                         'xpack.apm.settings.apmIndices.applyButton',