diff --git a/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster_slurmdbd.conf b/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster_slurmdbd.conf
index 39f34414e..e42003594 100644
--- a/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster_slurmdbd.conf
+++ b/cookbooks/aws-parallelcluster-slurm/files/default/head_node_slurm/slurm/templates/slurm_parallelcluster_slurmdbd.conf
@@ -6,7 +6,7 @@
 {#    #}DbdHost={{ head_node_config.head_node_hostname }}
 {#    #}StorageHost={{ scaling_config.Database.Uri | uri_host }}
 {#    #}StoragePort={{ scaling_config.Database.Uri | uri_port }}
-{#    #}{% if scaling_config.Database.DatabaseName is defined %}
+{#    #}{% if scaling_config.Database.DatabaseName is defined and scaling_config.Database.DatabaseName is not none %}
 {#        #}StorageLoc={{ scaling_config.Database.DatabaseName }}
 {#    #}{% else %}
 {#        #}{# Dashes in StorageLoc cause issues with the database creation #}
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_slurm_accounting.yaml b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_slurm_accounting.yaml
index 15d26413e..217e50861 100644
--- a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_slurm_accounting.yaml
+++ b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_files_slurm_accounting/sample_input_slurm_accounting.yaml
@@ -27,3 +27,4 @@ Scheduling:
             Uri: test.databaseserver.com
             UserName: test_admin
             PasswordSecretArn: arn:aws:secretsmanager:us-east-1:111111111111:secret:Secret-xxxxxxxx-xxxxx
+            DatabaseName: null