diff --git a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
index 0d651a09a4..8d48a6a511 100644
--- a/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
+++ b/src/main/java/com/alibaba/druid/filter/stat/StatFilter.java
@@ -424,10 +424,6 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
 
         if (sqlStat != null) {
             sqlStat.incrementExecuteSuccessCount();
-            for (int updateCount : updateCountArray) {
-                sqlStat.addUpdateCount(updateCount);
-                StatFilterContext.getInstance().addUpdateCount(updateCount);
-            }
 
             sqlStat.decrementRunningCount();
             sqlStat.addExecuteTime(statement.getLastExecuteType(), firstResult, nanoSpan);
@@ -439,6 +435,12 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
                 } catch (SQLException e) {
                     LOG.error("getUpdateCount error", e);
                 }
+            } else {
+                for (int updateCount : updateCountArray) {
+                    sqlStat.addUpdateCount(updateCount);
+                    sqlStat.addFetchRowCount(0);
+                    StatFilterContext.getInstance().addUpdateCount(updateCount);
+                }
             }
 
             long millis = nanoSpan / (1000 * 1000);
@@ -653,33 +655,4 @@ public class StatFilter extends FilterEventAdapter implements StatFilterMBean {
         return conn;
     }
 
-    public static enum Feature {
-
-        ;
-
-        private Feature(){
-            mask = (1 << ordinal());
-        }
-
-        private final int mask;
-
-        public final int getMask() {
-            return mask;
-        }
-
-        public static boolean isEnabled(int features, Feature feature) {
-            return (features & feature.getMask()) != 0;
-        }
-
-        public static int config(int features, Feature feature, boolean state) {
-            if (state) {
-                features |= feature.getMask();
-            } else {
-                features &= ~feature.getMask();
-            }
-
-            return features;
-        }
-    }
-
 }
diff --git a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
index 901d495a4b..c0c26bcdaa 100644
--- a/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
+++ b/src/main/java/com/alibaba/druid/stat/JdbcSqlStat.java
@@ -225,8 +225,6 @@ public final class JdbcSqlStat implements JdbcSqlStatMBean {
         }
 
         this.updateCountHistogram.record(delta);
-        this.fetchRowCountHistogram.record(0);
-
     }
 
     public long getUpdateCount() {