diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index 92eccc63..02803321 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -1235,6 +1235,10 @@ class Adapter {
     OEMCryptoResult result =
         pair.fcn->CreateEntitledKeySession(pair.session, key_session);
     if (result == OEMCrypto_SUCCESS) {
+      if (pair.session == *key_session) {
+        *key_session = oec_session;
+        return result;
+      }
       // Copy everything from |pair| except session field.
       LevelSession new_session;
       new_session.fcn = pair.fcn;