diff --git a/client/app/services/query.js b/client/app/services/query.js
index a02e9f84d4..593026375c 100644
--- a/client/app/services/query.js
+++ b/client/app/services/query.js
@@ -501,7 +501,7 @@ function QueryResource(
   };
 
   QueryService.prototype.getQueryResult = function getQueryResult(maxAge) {
-    const execute = () => QueryResult.getByQueryId(this.id, this.getParameters().getValues());
+    const execute = () => QueryResult.getByQueryId(this.id, this.getParameters().getValues(), maxAge);
     return this.prepareQueryResultExecution(execute, maxAge);
   };
 
diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py
index 34cfad1636..5d29b7650f 100644
--- a/redash/handlers/query_results.py
+++ b/redash/handlers/query_results.py
@@ -194,7 +194,11 @@ def post(self, query_id):
         """
         params = request.get_json(force=True)
         parameters = params.get('parameters', {})
-        max_age = int(params.get('max_age', 0))
+        max_age = params.get('max_age', -1)
+        # max_age might have the value of None, in which case calling int(None) will fail
+        if max_age is None:
+            max_age = -1
+        max_age = int(max_age)
 
         query = get_object_or_404(models.Query.get_by_id_and_org, query_id, self.current_org)
         parameter_schema = query.options.get("parameters", [])