diff --git a/public/app/features/variables/query/queryRunners.test.ts b/public/app/features/variables/query/queryRunners.test.ts
index 8757209939e..ffbaa9cc019 100644
--- a/public/app/features/variables/query/queryRunners.test.ts
+++ b/public/app/features/variables/query/queryRunners.test.ts
@@ -196,7 +196,7 @@ describe('QueryRunners', () => {
 
       it('then it should call runRequest with correct args', () => {
         expect(runRequest).toHaveBeenCalledTimes(1);
-        expect(runRequest).toHaveBeenCalledWith(datasource, {}, datasource.variables.query);
+        expect(runRequest).toHaveBeenCalledWith(datasource, {}, expect.anything());
       });
     });
 
@@ -263,7 +263,7 @@ describe('QueryRunners', () => {
 
       it('then it should call runRequest with correct args', () => {
         expect(runRequest).toHaveBeenCalledTimes(1);
-        expect(runRequest).toHaveBeenCalledWith(datasource, {}, datasource.variables.query);
+        expect(runRequest).toHaveBeenCalledWith(datasource, {}, expect.anything());
       });
     });
   });
diff --git a/public/app/features/variables/query/queryRunners.ts b/public/app/features/variables/query/queryRunners.ts
index 3229bff1eee..f2fac724251 100644
--- a/public/app/features/variables/query/queryRunners.ts
+++ b/public/app/features/variables/query/queryRunners.ts
@@ -122,7 +122,7 @@ class StandardQueryRunner implements QueryRunner {
       return runRequest(datasource, request);
     }
 
-    return runRequest(datasource, request, datasource.variables.query);
+    return runRequest(datasource, request, datasource.variables.query.bind(datasource.variables));
   }
 }
 
@@ -146,7 +146,7 @@ class CustomQueryRunner implements QueryRunner {
       return getEmptyMetricFindValueObservable();
     }
 
-    return runRequest(datasource, request, datasource.variables.query);
+    return runRequest(datasource, request, datasource.variables.query.bind(datasource.variables));
   }
 }
 
diff --git a/public/app/plugins/datasource/azuremonitor/variables.ts b/public/app/plugins/datasource/azuremonitor/variables.ts
index a5c7b7d062d..54fbf99d5e6 100644
--- a/public/app/plugins/datasource/azuremonitor/variables.ts
+++ b/public/app/plugins/datasource/azuremonitor/variables.ts
@@ -22,7 +22,6 @@ export class VariableSupport extends CustomVariableSupport<DataSource, AzureMoni
   constructor(private readonly datasource: DataSource) {
     super();
     this.datasource = datasource;
-    this.query = this.query.bind(this);
     this.templateSrv = getTemplateSrv();
   }
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/variables.ts b/public/app/plugins/datasource/cloud-monitoring/variables.ts
index 536f4312bcc..d8d67cae639 100644
--- a/public/app/plugins/datasource/cloud-monitoring/variables.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/variables.ts
@@ -17,7 +17,6 @@ export class CloudMonitoringVariableSupport extends CustomVariableSupport<
   constructor(private readonly datasource: CloudMonitoringDatasource) {
     super();
     this.metricFindQuery = new CloudMonitoringMetricFindQuery(datasource);
-    this.query = this.query.bind(this);
   }
 
   editor = CloudMonitoringVariableQueryEditor;
diff --git a/public/app/plugins/datasource/cloudwatch/variables.ts b/public/app/plugins/datasource/cloudwatch/variables.ts
index d912987b820..b011b17d93a 100644
--- a/public/app/plugins/datasource/cloudwatch/variables.ts
+++ b/public/app/plugins/datasource/cloudwatch/variables.ts
@@ -21,7 +21,6 @@ import { VariableQuery, VariableQueryType } from './types';
 export class CloudWatchVariableSupport extends CustomVariableSupport<CloudWatchDatasource, VariableQuery> {
   constructor(private readonly resources: ResourcesAPI) {
     super();
-    this.query = this.query.bind(this);
   }
 
   editor = VariableQueryEditor;
diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts
index bf71c4d1dc6..bfe2cf1d2b6 100644
--- a/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts
+++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/VariableSupport.ts
@@ -20,8 +20,6 @@ export class VariableSupport extends CustomVariableSupport<PhlareDataSource> {
     private readonly timeSrv: TimeSrv = getTimeSrv()
   ) {
     super();
-    // This is needed because code in queryRunners.ts passes this method without binding it.
-    this.query = this.query.bind(this);
   }
 
   editor = VariableQueryEditor;
diff --git a/public/app/plugins/datasource/loki/variables.ts b/public/app/plugins/datasource/loki/variables.ts
index 39d7c9b1c2c..b01d56e895c 100644
--- a/public/app/plugins/datasource/loki/variables.ts
+++ b/public/app/plugins/datasource/loki/variables.ts
@@ -12,7 +12,6 @@ export class LokiVariableSupport extends CustomVariableSupport<LokiDatasource, L
 
   constructor(private datasource: LokiDatasource) {
     super();
-    this.query = this.query.bind(this);
   }
 
   async execute(query: LokiVariableQuery) {
diff --git a/public/app/plugins/datasource/prometheus/variables.ts b/public/app/plugins/datasource/prometheus/variables.ts
index a2d3c541353..c8795f9bf71 100644
--- a/public/app/plugins/datasource/prometheus/variables.ts
+++ b/public/app/plugins/datasource/prometheus/variables.ts
@@ -18,7 +18,6 @@ export class PrometheusVariableSupport extends CustomVariableSupport<PrometheusD
     private readonly timeSrv: TimeSrv = getTimeSrv()
   ) {
     super();
-    this.query = this.query.bind(this);
   }
 
   editor = PromVariableQueryEditor;
diff --git a/public/app/plugins/datasource/tempo/variables.ts b/public/app/plugins/datasource/tempo/variables.ts
index ce13d60056a..afcfe6d0487 100644
--- a/public/app/plugins/datasource/tempo/variables.ts
+++ b/public/app/plugins/datasource/tempo/variables.ts
@@ -11,7 +11,6 @@ export class TempoVariableSupport extends CustomVariableSupport<TempoDatasource,
 
   constructor(private datasource: TempoDatasource) {
     super();
-    this.query = this.query.bind(this);
   }
 
   query(request: DataQueryRequest<TempoVariableQuery>): Observable<DataQueryResponse> {