1 files changed, 8 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
index b9ef1627ce7..f712690efc5 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java
@@ -102,10 +102,15 @@ public class VipStatus {
 
     private void updateCurrentlyInRotation() {
         synchronized (mutex) {
-            if (rotationOverride != null)
+            if (rotationOverride != null) {
                 currentlyInRotation = rotationOverride;
-            else
-                currentlyInRotation = clustersStatus.containerShouldReceiveTraffic();
+            } else {
+                if (healthState.status() == StateMonitor.Status.up) {
+                    currentlyInRotation = clustersStatus.containerShouldReceiveTraffic(ClustersStatus.Require.ONE);
+                } else {
+                    currentlyInRotation = clustersStatus.containerShouldReceiveTraffic(ClustersStatus.Require.ALL);
+                }
+            }
 
             // Change to/from 'up' when appropriate but don't change 'initializing' to 'down'
             if (currentlyInRotation)