diff --git a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
index 69c9b6fc4..51105a6f3 100644
--- a/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
+++ b/superset/assets/javascripts/SqlLab/components/ResultSet.jsx
@@ -190,7 +190,18 @@ class ResultSet extends React.PureComponent {
             {sql}
             <div className="ResultSet">
               <Table
-                data={data}
+                data={data.map(function (row) {
+                  const newRow = {};
+                  for (const k in row) {
+                    const val = row[k];
+                    if (typeof(val) === 'string') {
+                      newRow[k] = val;
+                    } else {
+                      newRow[k] = JSON.stringify(val);
+                    }
+                  }
+                  return newRow;
+                })}
                 columns={results.columns.map((col) => col.name)}
                 sortable
                 className="table table-condensed table-bordered"