diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 6c07011fc21..aca8251ee4d 100644
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -293,7 +293,11 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner {
 			if(podClusterMap.containsKey(pod)){
 				List<Long> clustersOfThisPod = (List<Long>)podClusterMap.get(pod);
 				if(clustersOfThisPod != null){
-					reorderedClusters.addAll(clustersOfThisPod);
+					for(Long clusterId : clusterIds){
+						if(clustersOfThisPod.contains(clusterId)){
+							reorderedClusters.add(clusterId);
+						}
+					}
 					clusterIds.removeAll(clustersOfThisPod);
 				}
 			}