diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index efc5db3b0d1..290acd02671 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -739,10 +739,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
         if (!privateIps.isEmpty()) {
             if (!(_privateIpAddressDao.deleteIpAddressByPod(podId))) {
                 throw new CloudRuntimeException("Failed to cleanup private ip addresses for pod " + podId);
-            }
-
-            // Delete corresponding capacity record
-            _capacityDao.removeBy(Capacity.CAPACITY_TYPE_PRIVATE_IP, null, podId, null, null);
+            }            
         }
 
         // Delete link local ip addresses for the pod
@@ -760,7 +757,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
                 _vlanDao.remove(vlan.getId());
             }
         }
-
+        
+        // Delete corresponding capacity records
+        _capacityDao.removeBy(null, null, podId, null, null);
+        
         // Delete the pod
         if (!(_podDao.remove(podId))) {
             throw new CloudRuntimeException("Failed to delete pod " + podId);