diff --git a/CHANGES.md b/CHANGES.md
index 509b50177c3668128cbfb5893f61ea12497101a3..466d45e977845ad66042674e38002984358d30e5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -52,6 +52,7 @@ Release Notes.
 * Fix the priority setting doesn't work of the ALS analyzers.
 * Fix bug that `endpoint-name-grouping.yml` is not customizable in Dockerized case.
 * Fix bug that istio version metric type on UI template mismatches the otel rule.
+* Improve ReadWriteSafeCache concurrency read-write performance
 
 #### UI
 * Fix un-removed tags in trace query.
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/ReadWriteSafeCache.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/ReadWriteSafeCache.java
index e73bbfbd80104fd53691f6f4742db9d4c73154e3..7fa8ff25dbc24937db2df6f0122311f1c52ccb56 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/ReadWriteSafeCache.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/data/ReadWriteSafeCache.java
@@ -85,10 +85,10 @@ public class ReadWriteSafeCache<T> {
             BufferedData<T> tempPointer = writeBufferPointer;
             writeBufferPointer = readBufferPointer;
             readBufferPointer = tempPointer;
-
-            return readBufferPointer.read();
         } finally {
             lock.unlock();
         }
+        // Call read method outside of write lock for concurrency read-write.
+        return readBufferPointer.read();
     }
 }