diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 7a440d3c9a..b7b22ab8f7 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -486,7 +486,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
         try {
             while (count == 0) {
-                if (minIdle == 0) {
+                if (minIdle == 0 || activeCount < maxActive) {
                     lowWater.signal();
                 }
 
@@ -505,9 +505,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 //        if (count <= minIdle - 1) {
 //            lowWater.signal();
 //        }
-        if (count == 0) {
-            lowWater.signal();
-        }
+//        if (count == 0) {
+//            lowWater.signal();
+//        }
 
         return last;
     }