diff --git a/CHANGES.md b/CHANGES.md
index a98f8a644..a7f307dd0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,7 @@ Release Notes.
 * Bump Lombok to 1.18.30 to adopt JDK21 compiling.
 * Fix PostgreSQL Jdbc URL parsing exception.
 * Bump up grpc version.
+* Optimize plugin selector logic.
 
 #### Documentation
 * Fix JDK requirement in the compiling docs.
diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java
index b48254677..21f6dea95 100644
--- a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java
+++ b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/PluginCfg.java
@@ -52,13 +52,13 @@ public enum PluginCfg {
                     LOGGER.error(e, "Failed to format plugin({}) define.", pluginDefine);
                 }
             }
-            pluginClassList = pluginSelector.select(pluginClassList);
         } finally {
             input.close();
         }
     }
 
     public List<PluginDefine> getPluginClassList() {
+        pluginClassList = pluginSelector.select(pluginClassList);
         return pluginClassList;
     }