diff --git a/salt/files/minion.conf b/salt/files/minion.conf
index 415dcc2..12509e1 100644
--- a/salt/files/minion.conf
+++ b/salt/files/minion.conf
@@ -92,7 +92,7 @@
   {%- endif %}
 {%- endif %}
 
-{%- if pillar.get('galera', {}).master is defined %}
+{%- if pillar.get('galera', {}).get('master', {}).get('enabled', False) %}
 
 {%- from "galera/map.jinja" import master with context %}
 mysql.unix_socket: {{ master.socket }}
@@ -101,7 +101,7 @@
 mysql.db: 'mysql'
 mysql.charset: 'utf8'
 
-{%- elif pillar.get('galera', {}).slave is defined %}
+{%- elif pillar.get('galera', {}).get('slave', {}).get('enabled', False) %}
 
 {%- from "galera/map.jinja" import slave with context %}
 mysql.unix_socket: {{ slave.socket }}
@@ -110,7 +110,7 @@
 mysql.db: 'mysql'
 mysql.charset: 'utf8'
 
-{%- elif pillar.get('mysql', {}).server is defined %}
+{%- elif pillar.get('mysql', {}).get('server', {}).get('enabled', False) %}
 
 mysql.unix_socket: /var/run/mysqld/mysqld.sock
 {%- if pillar.mysql.server.admin is defined %}