diff --git a/client/package-lock.json b/client/package-lock.json
index 0ec7f8ed4..ee9256960 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -30249,9 +30249,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.1.tgz",
-      "integrity": "sha512-cTmIDFW7O0IHbn1DPYjkiebHxwtCMU+eTy30ZtJNBPF9j2O1ITu5XH2YnBeVRKWHqF+3JQwWJv0Q0aUgX8W7IA==",
+      "version": "3.9.10",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
+      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
       "dev": true
     },
     "ua-parser-js": {
diff --git a/client/package.json b/client/package.json
index a9f33e7a0..4c4fe51a5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -213,7 +213,7 @@
     "tslint-eslint-rules": "^5.4.0",
     "tslint-no-focused-test": "^0.5.0",
     "tslint-react": "^5.0.0",
-    "typescript": "^3.3.1",
+    "typescript": "^3.9.10",
     "url-loader": "^1.1.2",
     "webpack": "^4.20.2",
     "webpack-build-notifier": "^0.1.30",
diff --git a/redash/handlers/query_results.py b/redash/handlers/query_results.py
index bae3e0797..1c4e71b3e 100644
--- a/redash/handlers/query_results.py
+++ b/redash/handlers/query_results.py
@@ -342,6 +342,10 @@ def get(self, query_id=None, query_result_id=None, filetype="json"):
             query_result = get_object_or_404(
                 models.QueryResult.get_by_id_and_org, query_result_id, self.current_org
             )
+            for row in query_result.data['rows']:
+                for key, value in row.items():
+                    if isinstance(value, int):
+                        row[key] = str(value)
 
         if query_id is not None:
             query = get_object_or_404(