diff --git a/libwvdrmengine/cdm/core/src/crypto_session.cpp b/libwvdrmengine/cdm/core/src/crypto_session.cpp
index 9442a5b7..937455fa 100644
--- a/libwvdrmengine/cdm/core/src/crypto_session.cpp
+++ b/libwvdrmengine/cdm/core/src/crypto_session.cpp
@@ -679,8 +679,14 @@ CdmResponseType CryptoSession::GetInternalDeviceUniqueId(
   const bool use_null_device_id = WithStaticFieldReadLock(
       "GetInternalDeviceUniqueId() use_null_device_id", [&] {
         if (requested_security_level_ != kLevelDefault) return false;
-        return sts == OEMCrypto_ERROR_KEYBOX_INVALID &&
-               needs_keybox_provisioning_;
+        if (!needs_keybox_provisioning_) return false;
+        if (sts != OEMCrypto_ERROR_KEYBOX_INVALID &&
+            sts != OEMCrypto_ERROR_NO_DEVICEID) {
+          // Logging other error for debugging, but null device
+          // ID should still be returned.
+          LOGE("Unexpected error: sts = %d", sts);
+        }
+        return true;
       });
   if (use_null_device_id) {
     LOGD("Using null device ID");