diff --git a/ui/src/dashboards/components/TagKeyDropdown.js b/ui/src/dashboards/components/TagKeyDropdown.js
index 8838c2686..4115bec06 100644
--- a/ui/src/dashboards/components/TagKeyDropdown.js
+++ b/ui/src/dashboards/components/TagKeyDropdown.js
@@ -53,12 +53,10 @@ class TagKeyDropdown extends Component {
tagKey,
onSelectTagKey,
onErrorThrown,
- } = this.props
- const {
source: {
links: {proxy},
},
- } = this.context
+ } = this.props
try {
const {data} = await showTagKeys({source: proxy, database, measurement})
@@ -78,15 +76,12 @@ class TagKeyDropdown extends Component {
const {func, shape, string} = PropTypes
-TagKeyDropdown.contextTypes = {
+TagKeyDropdown.propTypes = {
source: shape({
links: shape({
proxy: string.isRequired,
}).isRequired,
}).isRequired,
-}
-
-TagKeyDropdown.propTypes = {
database: string.isRequired,
measurement: string.isRequired,
tagKey: string,
diff --git a/ui/src/dashboards/components/template_variables/TemplateQueryBuilder.js b/ui/src/dashboards/components/template_variables/TemplateQueryBuilder.js
index 2409b9761..198573fd5 100644
--- a/ui/src/dashboards/components/template_variables/TemplateQueryBuilder.js
+++ b/ui/src/dashboards/components/template_variables/TemplateQueryBuilder.js
@@ -90,6 +90,7 @@ const TemplateQueryBuilder = ({
WITH KEY =
{selectedMeasurement ? (