diff --git a/assets/javascripts/discourse/components/query-result.js b/assets/javascripts/discourse/components/query-result.js
index 26255fb..d7f8b08 100644
--- a/assets/javascripts/discourse/components/query-result.js
+++ b/assets/javascripts/discourse/components/query-result.js
@@ -231,7 +231,7 @@ export default class QueryResult extends Component {
       "action",
       getURL(
         this._download_url() +
-          this.get("query.id") +
+          this.args.query.id +
           "/run." +
           format +
           "?download=1"
diff --git a/assets/javascripts/discourse/components/query-results-wrapper.hbs b/assets/javascripts/discourse/components/query-results-wrapper.hbs
index 9293a82..60ae2e1 100644
--- a/assets/javascripts/discourse/components/query-results-wrapper.hbs
+++ b/assets/javascripts/discourse/components/query-results-wrapper.hbs
@@ -1,7 +1,7 @@
 {{#if @results}}
   <div class="query-results">
     {{#if @showResults}}
-      <QueryResult @query={{@selectedItem}} @content={{@results}} />
+      <QueryResult @query={{@query}} @content={{@results}} />
     {{else}}
       {{#each @results.errors as |err|}}
         <pre class="query-error"><code>{{~err}}</code></pre>