diff --git a/components/esp_matter/esp_matter_cluster.cpp b/components/esp_matter/esp_matter_cluster.cpp
index 4d6487c20..f9b88d7d1 100644
--- a/components/esp_matter/esp_matter_cluster.cpp
+++ b/components/esp_matter/esp_matter_cluster.cpp
@@ -1145,7 +1145,6 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
         }
 
         /* Attributes managed internally */
-        attribute::create_remaining_time(cluster, 0);
         for (uint8_t idx = 1; idx <= config->number_of_primaries.value_or(0); ++idx) {
             attribute::create_primary_n_x(cluster, 0, idx);
             attribute::create_primary_n_y(cluster, 0, idx);
diff --git a/components/esp_matter/esp_matter_endpoint.cpp b/components/esp_matter/esp_matter_endpoint.cpp
index 0b163c6b9..64fbb5fe4 100644
--- a/components/esp_matter/esp_matter_endpoint.cpp
+++ b/components/esp_matter/esp_matter_endpoint.cpp
@@ -300,6 +300,7 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
     cluster_t *color_control_cluster = color_control::create(endpoint, &(config->color_control), CLUSTER_FLAG_SERVER);
     color_control::feature::color_temperature::add(color_control_cluster, &(config->color_control_color_temperature));
     color_control::attribute::create_remaining_time(color_control_cluster, config->color_control_remaining_time);
+    color_control::command::create_stop_move_step(color_control_cluster);
 
     return ESP_OK;
 }
@@ -340,6 +341,7 @@ esp_err_t add(endpoint_t *endpoint, config_t *config)
     color_control::feature::color_temperature::add(color_control_cluster, &(config->color_control_color_temperature));
     color_control::feature::xy::add(color_control_cluster, &(config->color_control_xy));
     color_control::attribute::create_remaining_time(color_control_cluster, config->color_control_remaining_time);
+    color_control::command::create_stop_move_step(color_control_cluster);
     return ESP_OK;
 }
 } /* extended_color_light */