diff --git a/postgresql/files/9.5/postgresql.conf.Debian b/postgresql/files/9.5/postgresql.conf.Debian
index d0f9482..1dee134 100644
--- a/postgresql/files/9.5/postgresql.conf.Debian
+++ b/postgresql/files/9.5/postgresql.conf.Debian
@@ -225,23 +225,24 @@
 
 # Set these on the master and on any standby that will send replication data.
 
-{%- if cluster.enabled and cluster.role != "master" %}
+{%- if cluster.get('enabled', False) %}
+
+{%- if cluster.role != "master" %}
 hot_standby = on
 {%- endif %}
 
-{%- if cluster.enabled and cluster.role == "master" %}
-
+{%- if cluster.role == "master" %}
 wal_level = hot_standby
 archive_mode = {{ cluster.archive }}
-
 max_wal_senders = {{ cluster.members|length + 1 }}
 max_replication_slots = {{ cluster.members|length + 1 }}
-
 {%- if cluster.synchronous %}
 synchronous_standby_names = '*'
 {%- endif %}
 {%- endif %}
 
+{%- endif %}
+
 #max_wal_senders = 0		# max number of walsender processes
 				# (change requires restart)
 #wal_keep_segments = 0		# in logfile segments, 16MB each; 0 disables