diff --git a/CHANGELOG.md b/CHANGELOG.md
index 955570387..91220001c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 **BUG FIXES**
 - Fix inconsistent scaling configuration after cluster update rollback when modifying the list of instance types declared in the Compute Resources.
 - Fix users SSH keys generation when switching users without root privilege in clusters integrated with an external LDAP server through cluster configuration files.
+- Fix disabling Slurm power save mode when setting ScaledownIdletime = -1 
 
 3.7.2
 ------
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 1c1f561ee..463f45b8f 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
@@ -5,7 +5,7 @@
 {% set ns = namespace(has_static=false) %}
 
 SlurmctldHost={{ head_node_config.head_node_hostname }}({{ head_node_config.head_node_ip }})
-SuspendTime={{ scaling_config.ScaledownIdletime * 60 }}
+SuspendTime={{ -1 if scaling_config.ScaledownIdletime == -1 else scaling_config.ScaledownIdletime * 60 }}
 ResumeTimeout={{ compute_node_bootstrap_timeout }}
 {% if scaling_config.EnableMemoryBasedScheduling %}
 SelectTypeParameters=CR_CPU_Memory
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/slurm_parallelcluster.conf b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/slurm_parallelcluster.conf
index a60543693..ed42bbfd1 100644
--- a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/slurm_parallelcluster.conf
+++ b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/expected_outputs/slurm_parallelcluster.conf
@@ -4,7 +4,7 @@
 # options
 
 SlurmctldHost=ip-1-0-0-0(ip.1.0.0.0)
-SuspendTime=600
+SuspendTime=-1
 ResumeTimeout=1600
 SelectTypeParameters=CR_CPU
 
diff --git a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/sample_input.yaml b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/sample_input.yaml
index 1932aea4c..a5e154a6a 100644
--- a/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/sample_input.yaml
+++ b/test/unit/slurm/test_slurm_config_generator/test_generating_slurm_config_flexible_instance_types/sample_input.yaml
@@ -384,5 +384,5 @@ Scheduling:
       UseEc2Hostnames: false
     EnableMemoryBasedScheduling: false
     QueueUpdateStrategy: COMPUTE_FLEET_STOP
-    ScaledownIdletime: 10
+    ScaledownIdletime: -1
     Database: null