diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 3f083813e8..f4009cd317 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -473,13 +473,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             if (isUseGloalDataSourceStat()) {
                 dataSourceStat = JdbcDataSourceStat.getGlobal();
-                if (dataSourceStat.getDbType() == null) {
-                    dataSourceStat.setDbType(this.getDbType());
-                }
                 if (dataSourceStat == null) {
                     dataSourceStat = new JdbcDataSourceStat("Global", "Global", this.dbType);
                     JdbcDataSourceStat.setGlobal(dataSourceStat);
                 }
+                if (dataSourceStat.getDbType() == null) {
+                    dataSourceStat.setDbType(this.getDbType());
+                }
             } else {
                 dataSourceStat = new JdbcDataSourceStat(this.name, this.jdbcUrl, this.dbType);
             }
diff --git a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
index b678a837e1..2bc41747dc 100644
--- a/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
+++ b/src/main/java/com/alibaba/druid/stat/JdbcDataSourceStat.java
@@ -71,8 +71,8 @@ public class JdbcDataSourceStat implements JdbcDataSourceStatMBean {
     private final AtomicLong                                    blobOpenCount           = new AtomicLong();
 
     private static JdbcDataSourceStat                           global                  = new JdbcDataSourceStat(
-                                                                                                                 "global",
-                                                                                                                 "global");
+                                                                                                                 "Global",
+                                                                                                                 "Global");
 
     public static JdbcDataSourceStat getGlobal() {
         return global;
diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java b/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java
index 226dd4fa39..d0a24ba237 100644
--- a/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java
+++ b/src/test/java/com/alibaba/druid/bvt/proxy/filter/GlobalStatTest0.java
@@ -77,6 +77,7 @@ public class GlobalStatTest0 extends TestCase {
         String json = JSONUtils.toJSONString(JdbcStatManager.getInstance().getSqlList());
         List<Map<String, Object>> sqlList = (List<Map<String, Object>>) JSONUtils.parse(json);
         Map<String, Object> sqlInfo = sqlList.get(0);
+        Assert.assertNotNull(sqlInfo);
         Assert.assertEquals(JdbcConstants.MOCK, sqlInfo.get("DbType"));
         Assert.assertEquals(2, sqlInfo.get("ExecuteCount"));
         Assert.assertEquals(2, sqlInfo.get("FetchRowCount"));