diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 8a73839301..5fe83ef43c 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -2728,7 +2728,9 @@ public class DruidDataSource extends DruidAbstractDataSource
 
     @Override
     public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception {
-        return null;
+        //do nothing
+        //return original name to avoid NullPointerException
+        return name;
     }
 
     @Override