diff --git a/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java b/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
index 306025691f..36468fe695 100644
--- a/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
+++ b/helix-core/src/main/java/org/apache/helix/controller/stages/IntermediateStateCalcStage.java
@@ -864,10 +864,8 @@ private void computeIntermediateMap(PartitionStateMap intermediateStateMap,
       entry.getValue().forEach((key, value) -> {
         if (!value.getToState().equals(HelixDefinedState.DROPPED.name())) {
           intermediateStateMap.setState(entry.getKey(), value.getTgtName(), value.getToState());
-        } else {
-          if (intermediateStateMap.getStateMap().containsKey(entry.getKey())) {
+        } else if (intermediateStateMap.getStateMap().containsKey(entry.getKey())) {
             intermediateStateMap.getStateMap().get(entry.getKey()).remove(value.getTgtName());
-          }
         }
       });
     }