diff --git a/public/app/features/dashboard/dashgrid/QueryOptions.tsx b/public/app/features/dashboard/dashgrid/QueryOptions.tsx index fad70d92990..df911800c20 100644 --- a/public/app/features/dashboard/dashgrid/QueryOptions.tsx +++ b/public/app/features/dashboard/dashgrid/QueryOptions.tsx @@ -94,7 +94,7 @@ export class QueryOptions extends PureComponent { renderOptions() { const { datasource, panel } = this.props; - const { queryOptions } = datasource.meta; + const queryOptions = datasource && datasource.meta ? datasource.meta.queryOptions : undefined; if (!queryOptions) { return null;