diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp
index 3312312..79c3bb9 100644
--- a/scheduler/schedule.cpp
+++ b/scheduler/schedule.cpp
@@ -670,11 +670,15 @@ void SensorScheduler::ClearScheduleCfg(int short_addr) {
         ShortAddrCfg::ClearCfg();
         UpdateCfg::ClearCfg();
         UpgradeCfg::ClearCfg();
+        wave_feature_set_inst::instance().RemoveAllFeatureCfg();
+        wave_feature_set_inst::instance().RemoveAllWaveCfg();
     } else {
         UpdateConfigResult(short_addr, 0);
         UpgradeResult(short_addr, kUpgradeSuccess);
         short_addr_map_.erase(short_addr);
         ShortAddrCfg::WriteCfg(short_addr_map_);
+        wave_feature_set_inst::instance().RemoveFeatureCfg(short_addr);
+        wave_feature_set_inst::instance().RemoveWaveCfg(short_addr);
     }
     
 }