diff --git a/pkg/tsdb/influxdb/flux/executor.go b/pkg/tsdb/influxdb/flux/executor.go
index 3ad252a2479..ac2b897fa2a 100644
--- a/pkg/tsdb/influxdb/flux/executor.go
+++ b/pkg/tsdb/influxdb/flux/executor.go
@@ -25,6 +25,11 @@ func ExecuteQuery(ctx context.Context, query QueryModel, runner queryRunner, max
 	tables, err := runner.runQuery(ctx, flux)
 	if err != nil {
 		dr.Error = err
+		metaFrame := data.NewFrame("meta for error")
+		metaFrame.Meta = &data.FrameMeta{
+			ExecutedQueryString: flux,
+		}
+		dr.Frames = append(dr.Frames, metaFrame)
 		return
 	}
 
diff --git a/pkg/tsdb/influxdb/flux/flux.go b/pkg/tsdb/influxdb/flux/flux.go
index abdaafc7bbd..3758d2f0b84 100644
--- a/pkg/tsdb/influxdb/flux/flux.go
+++ b/pkg/tsdb/influxdb/flux/flux.go
@@ -90,10 +90,7 @@ func RunnerFromDataSource(dsInfo *models.DataSource) (*Runner, error) {
 func backendDataResponseToTSDBResponse(dr *backend.DataResponse, refID string) *tsdb.QueryResult {
 	qr := &tsdb.QueryResult{RefId: refID}
 
-	if dr.Error != nil {
-		qr.Error = dr.Error
-		return qr
-	}
+	qr.Error = dr.Error
 
 	if dr.Frames != nil {
 		qr.Dataframes = tsdb.NewDecodedDataFrames(dr.Frames)
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index bafbefd99fc..39ba620bca5 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -66,7 +66,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       }
     }
 
-    // Proces flux queries (data frame request)
+    // Process flux queries (data frame request)
     if (hasFlux) {
       if (!this.enableFlux) {
         throw 'Flux not enabled for this datasource';