diff --git a/postgres/defaults.yaml b/postgres/defaults.yaml
index 71f473d..d5219be 100644
--- a/postgres/defaults.yaml
+++ b/postgres/defaults.yaml
@@ -16,6 +16,7 @@ postgres:
   group: postgres
 
   prepare_cluster:
+    run: True
     pgcommand: initdb -D
     pgtestfile: PG_VERSION
     user: postgres
diff --git a/postgres/server/init.sls b/postgres/server/init.sls
index 7ff492a..9d2a9b6 100644
--- a/postgres/server/init.sls
+++ b/postgres/server/init.sls
@@ -67,6 +67,7 @@ postgresql-cluster-prepared:
     - recurse:
       - user
       - group
+{%- if postgres.prepare_cluster.run %}
   cmd.run:
  {%- if postgres.prepare_cluster.command is defined %}
       {# support for depreciated 'prepare_cluster.command' pillar #}
@@ -84,6 +85,7 @@ postgresql-cluster-prepared:
       - file: postgresql-cluster-prepared
     - watch_in:
       - module: postgresql-service-restart
+{%- endif %}
 
 postgresql-config-dir:
   file.directory: