diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index 717c8c12..3e060cf0 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -1432,11 +1432,15 @@ CdmResponseType CdmEngine::RemoveAllUsageInfo(
 
 CdmResponseType CdmEngine::RemoveAllUsageInfo(const std::string& app_id) {
   LOGI("Removing all usage info: app_id = %s", app_id.c_str());
-  CdmResponseType status_l1, status_l3;
-  status_l1 = status_l3 = NO_ERROR;
-  status_l1 = RemoveAllUsageInfo(app_id, kSecurityLevelL1);
-  status_l3 = RemoveAllUsageInfo(app_id, kSecurityLevelL3);
-  return (status_l3 == NO_ERROR) ? status_l3 : status_l1;
+  const CdmResponseType status_l1 =
+      RemoveAllUsageInfo(app_id, kSecurityLevelL1);
+  const CdmResponseType status_l3 =
+      RemoveAllUsageInfo(app_id, kSecurityLevelL3);
+  // Prioritizing L1 status.
+  if (status_l1 != NO_ERROR) {
+    return status_l1;
+  }
+  return status_l3;
 }
 
 CdmResponseType CdmEngine::RemoveUsageInfo(