diff --git a/postgresql/server.sls b/postgresql/server.sls
index 11b29be..1d0f7e5 100644
--- a/postgresql/server.sls
+++ b/postgresql/server.sls
@@ -58,20 +58,6 @@
   - require:
     - file: /root/.pgpass
 
-postgresql_dirs:
-  file.directory:
-  - names:
-    - /root/postgresql/backup
-    - /root/postgresql/flags
-    - /root/postgresql/data
-    - /root/postgresql/scripts
-  - mode: 700
-  - user: root
-  - group: root
-  - makedirs: true
-  - require:
-    - pkg: postgresql_packages
-
 {%- for database_name, database in server.get('database', {}).iteritems() %}
 
 {%- for user in database.users %}
@@ -154,7 +140,21 @@
 
 {%- endif %}
 
-{% if server.initial_data is defined %}
+postgresql_dirs:
+  file.directory:
+  - names:
+    - /root/postgresql/backup
+    - /root/postgresql/flags
+    - /root/postgresql/data
+    - /root/postgresql/scripts
+  - mode: 700
+  - user: root
+  - group: root
+  - makedirs: true
+  - require:
+    - pkg: postgresql_packages
+
+{%- if server.initial_data is defined %}
 
 {%- set engine = server.initial_data.get("engine", "barman") %}
 
@@ -174,6 +174,6 @@
   - require:
     - file: /root/postgresql/scripts/restore_wal.sh
 
-{% endif %}
+{%- endif %}
 
 {%- endif %}