diff --git a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
index 504a6b05..a671d397 100644
--- a/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
+++ b/libwvdrmengine/cdm/core/src/entitlement_key_session.cpp
@@ -75,11 +75,8 @@ OEMCryptoResult EntitlementKeySession::SelectKey(const std::string& key_id,
 
     current_loaded_content_keys_[entitled_content_key.entitlement_key_id()] =
         key_id;
-
-    return ContentKeySession::SelectKey(key_id, cipher_mode);
-  } else {
-    return OEMCrypto_SUCCESS;
   }
+  return ContentKeySession::SelectKey(key_id, cipher_mode);
 }
 
 OEMCrypto_EntitledContentKeyObject EntitlementKeySession::MakeOecEntitledKey(