diff --git a/roles/setup_efm/defaults/main.yml b/roles/setup_efm/defaults/main.yml
index 64a729e7..fc73ff8a 100644
--- a/roles/setup_efm/defaults/main.yml
+++ b/roles/setup_efm/defaults/main.yml
@@ -111,6 +111,7 @@ pcp_passfile_owner: "efm"
 pcp_passfile_group: "efm"
 pcp_passfile_mode: "0600"
 pgpool2_pcp_port: 9898
+detach_on_agent_failure: true
 efm_pgpool2_lb_attach: "{{ efm_bin_path }}/pcp_attach_all.sh %h %t"
 efm_pgpool2_lb_detach: ""
 
diff --git a/roles/setup_efm/tasks/efm_configure.yml b/roles/setup_efm/tasks/efm_configure.yml
index 1012a04d..b1d43932 100644
--- a/roles/setup_efm/tasks/efm_configure.yml
+++ b/roles/setup_efm/tasks/efm_configure.yml
@@ -45,6 +45,7 @@
       - {name: custom.monitor.interval, value: "5"}
       - {name: custom.monitor.safe.mode, value: "true"}
       - {name: custom.monitor.timeout, value: "10"}
+      - {name: detach.on.agent.failure, value: "{{ detach_on_agent_failure }}"}
       - {name: pgpool.enable, value: "{{ efm_pgpool2_integration | lower }}"}
       - {name: pgpool.bin, value: "{{ pgpool2_bin_path }}"}
       - {name: pcp.user, value: "{{ pcp_admin_user }}"}