diff --git a/templates/postgresql.conf.j2 b/templates/postgresql.conf.j2
index 022f194..0d70952 100644
--- a/templates/postgresql.conf.j2
+++ b/templates/postgresql.conf.j2
@@ -56,7 +56,7 @@
 
 # - Connection Settings -
 
-listen_addresses = {{ postgresql_connection.listen_addresses|default('localhost, ' + postgresql_connection.host) }}
+listen_addresses = {{ postgresql_connection.listen_addresses }}
 #listen_addresses = '*'
                     # comma-separated list of addresses;
                     # defaults to 'localhost'; use '*' for all