diff --git a/js/chart.js b/js/chart.js
index c6627b9b76..99944710c0 100644
--- a/js/chart.js
+++ b/js/chart.js
@@ -414,14 +414,13 @@ JQPlotScatterChart.prototype.prepareData = function (dataTable) {
     for (var i = 0; i < data.length; i++) {
         row = data[i];
         if (row[0]) {
-            var x = parseFloat(row[0]);
             for (var j = 1; j < row.length; j++) {
                 retRow = retData[j - 1];
                 if (retRow === undefined) {
                     retRow = [];
                     retData[j - 1] = retRow;
                 }
-                retRow.push([x, row[j]]);
+                retRow.push([row[0], row[j]]);
             }
         }
     }
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 8f24eba6ff..07f15f8a0a 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -92,6 +92,8 @@ function PMA_queryChart(data, columnNames, settings) {
             if (j === 0) {
                 if (settings.type == 'timeline') { // first column is date type
                     newRow.push(extractDate(row[col]));
+                } else if (settings.type == 'scatter') {
+                    newRow.push(parseFloat(row[col]));
                 } else { // first column is string type
                     newRow.push(row[col]);
                 }