diff --git a/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c b/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
index 784a6c9c0f8f1c..c160246dd7e9f7 100644
--- a/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
+++ b/subsys/mgmt/ec_host_cmd/ec_host_cmd_handler.c
@@ -123,7 +123,7 @@ static enum ec_host_cmd_status validate_handler(const struct ec_host_cmd_handler
 		return EC_HOST_CMD_INVALID_RESPONSE;
 	}
 
-	if (args->version > sizeof(handler->version_mask) ||
+	if (args->version >= NUM_BITS(handler->version_mask) ||
 	    !(handler->version_mask & BIT(args->version))) {
 		return EC_HOST_CMD_INVALID_VERSION;
 	}