1 files changed, 3 insertions, 1 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
index 28d74c0b9f0..1cfbefae29b 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/DynamicThrottlePolicy.java
@@ -157,6 +157,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy {
      */
     public DynamicThrottlePolicy setWindowSizeIncrement(double windowSizeIncrement) {
         this.windowSizeIncrement = windowSizeIncrement;
+        this.windowSize = Math.max(this.minWindowSize, this.windowSizeIncrement);
         return this;
     }
 
@@ -240,6 +241,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy {
      */
     public DynamicThrottlePolicy setMinWindowSize(double min) {
         this.minWindowSize = min;
+        this.windowSize = Math.max(this.minWindowSize, this.windowSizeIncrement);
         return this;
     }
 
@@ -265,7 +267,7 @@ public class DynamicThrottlePolicy extends StaticThrottlePolicy {
      * @return the max limit
      */
     public int getMaxPendingCount() {
-        return (int)windowSize;
+        return (int) windowSize;
     }
 
 }