diff --git a/main/application.cc b/main/application.cc
index a0738d9e..91e41314 100644
--- a/main/application.cc
+++ b/main/application.cc
@@ -36,7 +36,9 @@ static const char* const STATE_STRINGS[] = {
 Application::Application() {
     event_group_ = xEventGroupCreate();
 
-#if CONFIG_USE_DEVICE_AEC
+#if CONFIG_USE_DEVICE_AEC && CONFIG_USE_SERVER_AEC
+#error "CONFIG_USE_DEVICE_AEC and CONFIG_USE_SERVER_AEC cannot be enabled at the same time"
+#elif CONFIG_USE_DEVICE_AEC
     aec_mode_ = kAecOnDeviceSide;
 #elif CONFIG_USE_SERVER_AEC
     aec_mode_ = kAecOnServerSide;
diff --git a/main/audio/audio_service.cc b/main/audio/audio_service.cc
index 2a22259d..d6b73513 100644
--- a/main/audio/audio_service.cc
+++ b/main/audio/audio_service.cc
@@ -288,11 +288,13 @@ void AudioService::AudioOutputTask() {
         last_output_time_ = std::chrono::steady_clock::now();
         debug_statistics_.playback_count++;
 
-        /* Record the timestamp */
+#if CONFIG_USE_SERVER_AEC
+        /* Record the timestamp for server AEC */
         if (task->timestamp > 0) {
             lock.lock();
             timestamp_queue_.push_back(task->timestamp);
         }
+#endif
     }
 
     ESP_LOGW(TAG, "Audio output task stopped");
@@ -405,7 +407,7 @@ void AudioService::PushTaskToEncodeQueue(AudioTaskType type, std::vector<int16_t
         if (timestamp_queue_.size() <= MAX_TIMESTAMPS_IN_QUEUE) {
             task->timestamp = timestamp_queue_.front();
         } else {
-            ESP_LOGW(TAG, "Timestamp queue is full, dropping timestamp");
+            ESP_LOGW(TAG, "Timestamp queue (%u) is full, dropping timestamp", timestamp_queue_.size());
         }
         timestamp_queue_.pop_front();
     }
diff --git a/main/audio/processors/afe_audio_processor.cc b/main/audio/processors/afe_audio_processor.cc
index 4dcd63fe..ead4a360 100644
--- a/main/audio/processors/afe_audio_processor.cc
+++ b/main/audio/processors/afe_audio_processor.cc
@@ -12,8 +12,7 @@ AfeAudioProcessor::AfeAudioProcessor()
 
 void AfeAudioProcessor::Initialize(AudioCodec* codec, int frame_duration_ms) {
     codec_ = codec;
-    frame_duration_ms_ = frame_duration_ms;
-    frame_samples_ = frame_duration_ms_ * codec_->input_sample_rate() / 1000;
+    frame_samples_ = frame_duration_ms * 16000 / 1000;
 
     // Pre-allocate output buffer capacity
     output_buffer_.reserve(frame_samples_);
diff --git a/main/audio/processors/afe_audio_processor.h b/main/audio/processors/afe_audio_processor.h
index 345fd5fe..b4a378ad 100644
--- a/main/audio/processors/afe_audio_processor.h
+++ b/main/audio/processors/afe_audio_processor.h
@@ -35,7 +35,6 @@ private:
     std::function<void(std::vector<int16_t>&& data)> output_callback_;
     std::function<void(bool speaking)> vad_state_change_callback_;
     AudioCodec* codec_ = nullptr;
-    int frame_duration_ms_ = 0;
     int frame_samples_ = 0;
     bool is_speaking_ = false;
     std::vector<int16_t> output_buffer_;
diff --git a/main/audio/processors/no_audio_processor.cc b/main/audio/processors/no_audio_processor.cc
index 4134bc75..f88b95c2 100644
--- a/main/audio/processors/no_audio_processor.cc
+++ b/main/audio/processors/no_audio_processor.cc
@@ -3,10 +3,9 @@
 
 #define TAG "NoAudioProcessor"
 
-void NoAudioProcessor::Initialize(AudioCodec* codec, int frame_duration_ms) :
-    codec_(codec),
-    frame_duration_ms_(frame_duration_ms) {
-    frame_samples_ = frame_duration_ms_ * codec_->input_sample_rate() / 1000;
+void NoAudioProcessor::Initialize(AudioCodec* codec, int frame_duration_ms) {
+    codec_ = codec;
+    frame_samples_ = frame_duration_ms * 16000 / 1000;
 }
 
 void NoAudioProcessor::Feed(std::vector<int16_t>&& data) {
diff --git a/main/audio/processors/no_audio_processor.h b/main/audio/processors/no_audio_processor.h
index 3b20e92e..d77dfdc2 100644
--- a/main/audio/processors/no_audio_processor.h
+++ b/main/audio/processors/no_audio_processor.h
@@ -24,7 +24,6 @@ public:
 
 private:
     AudioCodec* codec_ = nullptr;
-    int frame_duration_ms_ = 0;
     int frame_samples_ = 0;
     std::function<void(std::vector<int16_t>&& data)> output_callback_;
     std::function<void(bool speaking)> vad_state_change_callback_;
diff --git a/main/idf_component.yml b/main/idf_component.yml
index 19df4921..f988332e 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -14,7 +14,7 @@ dependencies:
   espressif/esp_lcd_panel_io_additions: ^1.0.1
   78/esp_lcd_nv3023: ~1.0.0
   78/esp-wifi-connect: ~2.4.3
-  78/esp-opus-encoder: ~2.3.3
+  78/esp-opus-encoder: ~2.4.0
   78/esp-ml307: ~3.0.2
   78/xiaozhi-fonts: ~1.3.2
   espressif/led_strip: ^2.5.5