diff --git a/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp b/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
index f3660d98..4ecb1897 100644
--- a/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
+++ b/libwvdrmengine/mediadrm/aidl_src/WVDrmPlugin.cpp
@@ -263,6 +263,11 @@ SecurityLevel WVDrmPlugin::mapSecurityLevel(const std::string& level) {
 ::ndk::ScopedAStatus WVDrmPlugin::openSession(SecurityLevel in_securityLevel,
                                               vector<uint8_t>* _aidl_return) {
   vector<uint8_t> sessionId;
+  if (SecurityLevel::DEFAULT == in_securityLevel) {
+    auto err = openSessionCommon(sessionId);
+    *_aidl_return = sessionId;
+    return toNdkScopedAStatus(err);
+  }
 
   if (SecurityLevel::UNKNOWN == in_securityLevel) {
     *_aidl_return = sessionId;
@@ -279,8 +284,7 @@ SecurityLevel WVDrmPlugin::mapSecurityLevel(const std::string& level) {
   }
 
   if (wvcdm::QUERY_VALUE_SECURITY_LEVEL_L3 == native_security_level &&
-      in_securityLevel >= SecurityLevel::SW_SECURE_DECODE &&
-      in_securityLevel != SecurityLevel::DEFAULT) {
+      in_securityLevel >= SecurityLevel::SW_SECURE_DECODE) {
     *_aidl_return = sessionId;
     return toNdkScopedAStatus(Status::ERROR_DRM_CANNOT_HANDLE);
   }
@@ -292,25 +296,13 @@ SecurityLevel WVDrmPlugin::mapSecurityLevel(const std::string& level) {
 
   setPropertyString("securityLevel", std::string(wvcdm_security_level));
 
-  SecurityLevel securityLevel = in_securityLevel;
-  if (SecurityLevel::DEFAULT == in_securityLevel) {
-    std::string level;
-    Status status = queryProperty(wvcdm::kLevelDefault,
-                                  wvcdm::QUERY_KEY_SECURITY_LEVEL, level);
-    if (status == Status::OK) {
-      securityLevel = mapSecurityLevel(level);
-    } else {
-      ALOGE("openSession: failed to query security level, status=%d", status);
-    }
-  }
-
   status = openSessionCommon(sessionId);
   if (Status::OK == status) {
     SecurityLevel currentSecurityLevel = SecurityLevel::UNKNOWN;
     const auto ret = getSecurityLevel(sessionId, &currentSecurityLevel);
-    if (!ret.isOk() || securityLevel != currentSecurityLevel) {
+    if (!ret.isOk() || in_securityLevel != currentSecurityLevel) {
       ALOGE("Failed to open session with the requested security level=%d",
-            securityLevel);
+            in_securityLevel);
       closeSession(sessionId);
       sessionId.clear();
       status = Status::ERROR_DRM_INVALID_STATE;