diff --git a/src/app/clusters/temperature-control-server/temperature-control-server.cpp b/src/app/clusters/temperature-control-server/temperature-control-server.cpp
index cdfd9099e71711..8c72347818333e 100644
--- a/src/app/clusters/temperature-control-server/temperature-control-server.cpp
+++ b/src/app/clusters/temperature-control-server/temperature-control-server.cpp
@@ -145,6 +145,11 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback(app::CommandHandler
                 goto exit;
             }
 
+            if (targetTemperature.Value() < minTemperature || targetTemperature.Value() > maxTemperature)
+            {
+                status = Status::ConstraintError;
+                goto exit;
+            }
             if (TemperatureControlHasFeature(endpoint, TemperatureControl::Feature::kTemperatureStep))
             {
                 int16_t step  = 0;
@@ -161,14 +166,6 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback(app::CommandHandler
                     goto exit;
                 }
             }
-            else
-            {
-                if (targetTemperature.Value() < minTemperature || targetTemperature.Value() > maxTemperature)
-                {
-                    status = Status::ConstraintError;
-                    goto exit;
-                }
-            }
             emberAfStatus = TemperatureSetpoint::Set(endpoint, targetTemperature.Value());
             if (emberAfStatus != EMBER_ZCL_STATUS_SUCCESS)
             {