diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/SyncTimeRecorder.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/SyncTimeRecorder.java
index 8c21c80c..35891fa1 100644
--- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/SyncTimeRecorder.java
+++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/SyncTimeRecorder.java
@@ -134,7 +134,7 @@ public class SyncTimeRecorder {
          * @return avg task time
          */
         public long getAvgTaskTimeMillis() {
-            return getMinTaskTime() / getTaskCount();
+            return getTotalTaskTime() / getTaskCount();
         }
 
     }
diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordAwareProcessorPlugin.java b/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
similarity index 93%
rename from hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordAwareProcessorPlugin.java
rename to hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
index 17b89e75..b1279781 100644
--- a/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordAwareProcessorPlugin.java
+++ b/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeRecordPlugin.java
@@ -32,9 +32,9 @@ import java.util.Objects;
  * @see TaskTimeoutNotifyAlarmPlugin
  */
 @RequiredArgsConstructor
-public class TaskTimeRecordAwareProcessorPlugin extends SyncTimeRecorder implements ExecuteAwarePlugin {
+public class TaskTimeRecordPlugin extends SyncTimeRecorder implements ExecuteAwarePlugin {
 
-    public static final String PLUGIN_NAME = "task-time-record-aware-processor";
+    public static final String PLUGIN_NAME = "task-time-record-plugin";
 
     /**
      * Get id.
diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java b/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
index 3ee6ed36..f605aa06 100644
--- a/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
+++ b/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/TaskTimeoutNotifyAlarmPlugin.java
@@ -33,7 +33,7 @@ import java.util.Optional;
  * @author huangchengxing
  */
 @AllArgsConstructor
-public class TaskTimeoutNotifyAlarmPlugin extends TaskTimeRecordAwareProcessorPlugin {
+public class TaskTimeoutNotifyAlarmPlugin extends TaskTimeRecordPlugin {
 
     public static final String PLUGIN_NAME = "task-timeout-notify-alarm-plugin";
 
diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java b/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
index 10c7169f..87437c7a 100644
--- a/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
+++ b/hippo4j-core/src/main/java/cn/hippo4j/core/plugin/impl/ThreadPoolExecutorShutdownPlugin.java
@@ -94,7 +94,7 @@ public class ThreadPoolExecutorShutdownPlugin implements ShutdownAwarePlugin {
      */
     @Override
     public void afterShutdown(ThreadPoolExecutor executor, List<Runnable> remainingTasks) {
-        if (executor instanceof ExtensibleThreadPoolExecutor && CollectionUtil.isNotEmpty(remainingTasks)) {
+        if (executor instanceof ExtensibleThreadPoolExecutor) {
             ExtensibleThreadPoolExecutor pool = (ExtensibleThreadPoolExecutor) executor;
             if (!waitForTasksToCompleteOnShutdown && CollectionUtil.isNotEmpty(remainingTasks)) {
                 remainingTasks.forEach(this::cancelRemainingTask);