diff --git a/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster.conf b/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster.conf
index c6def9daaa..07c383ff79 100644
--- a/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster.conf
+++ b/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster.conf
@@ -13,12 +13,12 @@ SelectTypeParameters=CR_CPU_Memory
 {% else %}
 SelectTypeParameters=CR_CPU
 {% endif %}
-{% if scaling_config.Database.Uri is defined or scaling_config.ExternalSlurmdbd != None %}
+{% if scaling_config.Database or scaling_config.ExternalSlurmdbd %}
 {#  #}AccountingStorageType=accounting_storage/slurmdbd
-{#  #}{% if scaling_config.Database.Uri is defined %}
+{#  #}{% if scaling_config.Database %}
 {#      #}AccountingStorageHost={{ head_node_config.head_node_hostname }}
 {#      #}AccountingStoragePort=6819
-{#  #}{% elif scaling_config.ExternalSlurmdbd.Host is defined %}
+{#  #}{% elif scaling_config.ExternalSlurmdbd %}
 {#      #}AccountingStorageHost={{ scaling_config.ExternalSlurmdbd.Host }}
 {#      #}AccountingStoragePort={{ scaling_config.ExternalSlurmdbd.Port }}
 {#  #}{% endif %}