diff --git a/tasks/pg.yaml b/tasks/pg.yaml
index dd979f7..b912dc7 100644
--- a/tasks/pg.yaml
+++ b/tasks/pg.yaml
@@ -79,21 +79,24 @@
   set_fact:
     wal_g_pg_major_version: "{{ ansible_facts.packages[wal_g_postgresql_package][0]['version'] | split('.') | first }}"
 
-- name: Merge user options for WAL-G part of config
-  set_fact:
-    wal_g_combined_config: "{{ wal_g_default_config | combine(wal_g_config|default({}), recursive=true) }}"
+- name: Create wal-g config
+  when: wal_g_config is defined
+  block:
+    - name: Merge user options for WAL-G part of config
+      set_fact:
+        wal_g_combined_config: "{{ wal_g_default_config | combine(wal_g_config|default({}), recursive=true) }}"
 
-- name: "Generate conf file walg.json"
-  copy:
-    content: "{{ wal_g_combined_config | to_nice_json }}"
-    dest: "{{ wal_g_pg_home_dir }}/{{ wal_g_config_name }}"
-    owner: "{{ wal_g_pg_config_owner }}"
-    group: "{{ wal_g_pg_config_group }}"
-    mode: 0644
-  tags: wal-g, wal_g, wal_g_conf
+    - name: "Generate conf file walg.json"
+      copy:
+        content: "{{ wal_g_combined_config | to_nice_json }}"
+        dest: "{{ wal_g_pg_home_dir }}/{{ wal_g_config_name }}"
+        owner: "{{ wal_g_pg_config_owner }}"
+        group: "{{ wal_g_pg_config_group }}"
+        mode: 0644
+      tags: wal-g, wal_g, wal_g_conf
 
 - name: Create wal-g restore config
-  when: wal_g_restore
+  when: wal_g_restore_config is defined
   block:
     - name: Merge user options for WAL-G part of restore config
       set_fact: