diff --git a/libmysql/authentication_fido/fido_assertion.cc b/libmysql/authentication_fido/fido_assertion.cc
index b496351fdd9..f2404d1da89 100644
--- a/libmysql/authentication_fido/fido_assertion.cc
+++ b/libmysql/authentication_fido/fido_assertion.cc
@@ -98,7 +98,8 @@ bool fido_prepare_assert::sign_challenge() {
   fido_init(0);
   size_t dev_infos_len = 0;
   fido_dev_info_t *dev_infos = fido_dev_info_new(1);
-  if (fido_dev_info_manifest(dev_infos, 1, &dev_infos_len) != FIDO_OK) {
+  if (fido_dev_info_manifest(dev_infos, 1, &dev_infos_len) != FIDO_OK ||
+      dev_infos_len == 0) {
     fido_dev_info_free(&dev_infos, 1);
     get_plugin_messages("No FIDO device available on client host.",
                         message_type::ERROR);