diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index f10f79a1..ec7e7522 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -1240,14 +1240,28 @@ class Adapter {
   bool IsOTAKeyboxSupported() {
     if (!level1_valid_) return false;
     if (!level1_.GenerateOTARequest) return false;
+    if (!level1_.OpenSession || !level1_.CloseSession) return false;
+    OEMCrypto_SESSION session = 0;
+    OEMCryptoResult result = level1_.OpenSession(&session);
+    if (result != OEMCrypto_SUCCESS) {
+      LOGE("Failed to open keybox OTA session: result = %d", result);
+      return false;
+    }
     size_t buffer_size = 500;  // a large buffer.
     std::vector<uint8_t> buffer(buffer_size);
-    OEMCryptoResult result =
-        level1_.GenerateOTARequest(0, buffer.data(), &buffer_size, 0);
+    result =
+        level1_.GenerateOTARequest(session, buffer.data(), &buffer_size, 0);
     if (result == OEMCrypto_ERROR_SHORT_BUFFER) {
       buffer.resize(buffer_size);
-      result = level1_.GenerateOTARequest(0, buffer.data(), &buffer_size, 0);
+      result =
+          level1_.GenerateOTARequest(session, buffer.data(), &buffer_size, 0);
     }
+    if (result != OEMCrypto_SUCCESS &&
+        result != OEMCrypto_ERROR_NOT_IMPLEMENTED) {
+      LOGE("Unexpected OTA error: buffer_size = %zu, result = %d", buffer_size,
+           static_cast<int>(result));
+    }
+    level1_.CloseSession(session);
     return result == OEMCrypto_SUCCESS;
   }