diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index f0e50681..2b6072ce 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -804,6 +804,11 @@ CdmResponseType CdmEngine::GetUsageInfo(const std::string& app_id,
 }
 
 CdmResponseType CdmEngine::ReleaseAllUsageInfo(const std::string& app_id) {
+  if (NULL == usage_property_set_.get()) {
+    usage_property_set_.reset(new UsagePropertySet());
+  }
+  usage_property_set_->set_app_id(app_id);
+
   CdmResponseType status = NO_ERROR;
   for (int j = kSecurityLevelL1; j < kSecurityLevelUnknown; ++j) {
     DeviceFiles handle;
@@ -814,6 +819,13 @@ CdmResponseType CdmEngine::ReleaseAllUsageInfo(const std::string& app_id) {
              "stops", j);
         status = RELEASE_ALL_USAGE_INFO_ERROR_1;
       } else {
+        SecurityLevel security_level =
+            static_cast<CdmSecurityLevel>(j) == kSecurityLevelL3
+                ? kLevel3
+                : kLevelDefault;
+        usage_property_set_->set_security_level(security_level);
+        usage_session_.reset(
+            new CdmSession(usage_property_set_.get(), EMPTY_ORIGIN, NULL));
         CdmResponseType status2 = usage_session_->
             DeleteMultipleUsageInformation(provider_session_tokens);
         if (status2 != NO_ERROR) {
@@ -826,6 +838,7 @@ CdmResponseType CdmEngine::ReleaseAllUsageInfo(const std::string& app_id) {
       status = RELEASE_ALL_USAGE_INFO_ERROR_2;
     }
   }
+  usage_session_.reset(NULL);
   return status;
 }