diff --git a/core/src/main/java/kafka/autobalancer/model/ClusterModel.java b/core/src/main/java/kafka/autobalancer/model/ClusterModel.java
index 41acd70785..fa2e4643e4 100644
--- a/core/src/main/java/kafka/autobalancer/model/ClusterModel.java
+++ b/core/src/main/java/kafka/autobalancer/model/ClusterModel.java
@@ -375,8 +375,11 @@ public void deletePartition(Uuid topicId, int partitionId) {
                 logger.error("Failed to find topic name for id {} when deleting partition", topicId);
                 return;
             }
+            if (!partitionReplicaMap.containsKey(partitionId)) {
+                return;
+            }
             int brokerId = partitionReplicaMap.remove(partitionId);
-            if (brokerId != -1 && brokerReplicaMap.containsKey(brokerId)) {
+            if (brokerReplicaMap.containsKey(brokerId)) {
                 brokerReplicaMap.get(brokerId).remove(new TopicPartition(topicName, partitionId));
             }
         } finally {