diff --git a/components/esp_matter/data_model/esp_matter_cluster.cpp b/components/esp_matter/data_model/esp_matter_cluster.cpp
index 22e218f42..e8aa85d8e 100644
--- a/components/esp_matter/data_model/esp_matter_cluster.cpp
+++ b/components/esp_matter/data_model/esp_matter_cluster.cpp
@@ -3387,8 +3387,9 @@ cluster_t *create(endpoint_t *endpoint, config_t *config, uint8_t flags)
         attribute::create_border_agent_id(cluster, nullptr, 0);
         attribute::create_thread_version(cluster, 0);
         attribute::create_interface_enabled(cluster, false);
-        nullable<uint64_t> timestamp;
-        attribute::create_active_dataset_timestamp(cluster, timestamp);
+        nullable<uint64_t> active_dataset_timestamp, pending_dataset_timestamp;
+        attribute::create_active_dataset_timestamp(cluster, active_dataset_timestamp);
+        attribute::create_pending_dataset_timestamp(cluster, pending_dataset_timestamp);
 
         /** Attributes not managed internally **/
         global::attribute::create_cluster_revision(cluster, cluster_revision);
diff --git a/components/esp_matter/data_model/esp_matter_feature.cpp b/components/esp_matter/data_model/esp_matter_feature.cpp
index d5a8ccd6b..ac11fe911 100644
--- a/components/esp_matter/data_model/esp_matter_feature.cpp
+++ b/components/esp_matter/data_model/esp_matter_feature.cpp
@@ -3171,9 +3171,6 @@ esp_err_t add(cluster_t *cluster)
 {
     VerifyOrReturnError(cluster, ESP_ERR_INVALID_ARG, ESP_LOGE(TAG, "Cluster cannot be NULL"));
     update_feature_map(cluster, get_id());
-    /* attribute */
-    nullable<uint64_t> timestamp;
-    attribute::create_pending_dataset_timestamp(cluster, timestamp);
 
     /* command */
     command::create_set_pending_dataset_request(cluster);