diff --git a/zeppelin-web/src/app/tabledata/pivot.js b/zeppelin-web/src/app/tabledata/pivot.js
index a0f61b219a4..da2990043b0 100644
--- a/zeppelin-web/src/app/tabledata/pivot.js
+++ b/zeppelin-web/src/app/tabledata/pivot.js
@@ -138,8 +138,8 @@ export default class PivotTransformation extends Transformation {
   pivot (data, keys, groups, values) {
     let aggrFunc = {
       sum: function (a, b) {
-        let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
-        let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
+        let varA = (a !== undefined) ? (isNaN(a) ? 0 : parseFloat(a)) : 0
+        let varB = (b !== undefined) ? (isNaN(b) ? 0 : parseFloat(b)) : 0
         return varA + varB
       },
       count: function (a, b) {
@@ -148,22 +148,38 @@ export default class PivotTransformation extends Transformation {
         return varA + varB
       },
       min: function (a, b) {
-        let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
-        let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
-        return Math.min(varA, varB)
+        let aIsValid = isValidNumber(a)
+        let bIsValid = isValidNumber(b)
+        if (!aIsValid) {
+          return parseFloat(b)
+        } else if (!bIsValid) {
+          return parseFloat(a)
+        } else {
+          return Math.min(parseFloat(a), parseFloat(b))
+        }
       },
       max: function (a, b) {
-        let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
-        let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
-        return Math.max(varA, varB)
+        let aIsValid = isValidNumber(a)
+        let bIsValid = isValidNumber(b)
+        if (!aIsValid) {
+          return parseFloat(b)
+        } else if (!bIsValid) {
+          return parseFloat(a)
+        } else {
+          return Math.max(parseFloat(a), parseFloat(b))
+        }
       },
       avg: function (a, b, c) {
-        let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
-        let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
+        let varA = (a !== undefined) ? (isNaN(a) ? 0 : parseFloat(a)) : 0
+        let varB = (b !== undefined) ? (isNaN(b) ? 0 : parseFloat(b)) : 0
         return varA + varB
       }
     }
 
+    let isValidNumber = function(num) {
+      return num !== undefined && !isNaN(num)
+    }
+
     let aggrFuncDiv = {
       sum: false,
       count: false,
diff --git a/zeppelin-web/src/app/tabledata/tabledata.test.js b/zeppelin-web/src/app/tabledata/tabledata.test.js
index 3de2fa3fb72..e24b0733924 100644
--- a/zeppelin-web/src/app/tabledata/tabledata.test.js
+++ b/zeppelin-web/src/app/tabledata/tabledata.test.js
@@ -83,4 +83,49 @@ describe('PivotTransformation build', function() {
     expect(config.common.pivot.keys[1].index).toBe(3)
     expect(config.common.pivot.keys[2].index).toBe(5)
   })
+
+  it('should aggregate values correctly', function() {
+    let td = new TableData()
+    td.loadParagraphResult({
+      type: 'TABLE',
+      msg: 'key\tvalue\na\t10\na\tnull\na\t0\na\t1\n'
+    })
+
+    let config = {
+      common: {
+        pivot: {
+          keys: [
+            {
+              'name': 'key',
+              'index': 0.0,
+            }
+          ],
+          groups: [],
+          values: [
+            {
+              'name': 'value',
+              'index': 1.0,
+              'aggr': 'sum'
+            }
+          ]
+        }
+      }
+    }
+
+    pt.setConfig(config)
+    let transformed = pt.transform(td)
+    expect(transformed.rows['a']['value(sum)'].value).toBe(11)
+
+    pt.config.common.pivot.values[0].aggr = 'max'
+    transformed = pt.transform(td)
+    expect(transformed.rows['a']['value(max)'].value).toBe(10)
+
+    pt.config.common.pivot.values[0].aggr = 'min'
+    transformed = pt.transform(td)
+    expect(transformed.rows['a']['value(min)'].value).toBe(0)
+
+    pt.config.common.pivot.values[0].aggr = 'count'
+    transformed = pt.transform(td)
+    expect(transformed.rows['a']['value(count)'].value).toBe(4)
+  })
 })