diff --git a/libwvdrmengine/cdm/core/src/cdm_engine.cpp b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
index 558a2a1d..98a52c16 100644
--- a/libwvdrmengine/cdm/core/src/cdm_engine.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_engine.cpp
@@ -694,7 +694,6 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
         LOGW("GetProvisioningMethod returns invalid token type: %d",
              static_cast<int>(token_type));
         return GET_PROVISIONING_METHOD_ERROR;
-        break;
     }
     return NO_ERROR;
   } else if (query_token == QUERY_KEY_MAX_USAGE_TABLE_ENTRIES) {
@@ -705,6 +704,7 @@ CdmResponseType CdmEngine::QueryStatus(SecurityLevel security_level,
       return UNKNOWN_ERROR;
     }
     *query_response = std::to_string(max_number_of_usage_entries);
+    return NO_ERROR;
   } else if (query_token == QUERY_KEY_OEMCRYPTO_API_MINOR_VERSION) {
     uint32_t api_minor_version;
     if (!crypto_session->GetApiMinorVersion(security_level,