diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
index 380893d45b8..920b367cd28 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -417,7 +417,14 @@ public class AlertManagerImpl implements AlertManager {
 
             try {
                 List<CapacityVO> capacityList = _capacityDao.listAll();
-                Map<String, List<CapacityVO>> capacityDcTypeMap = new HashMap<String, List<CapacityVO>>();
+                Map<String, List<CapacityVO>> capacityDcTypeMap = new HashMap<String, List<CapacityVO>>();
+                List<CapacityVO> storagePoolStatsList = _storageMgr.getStoragePoolUsedStats(null, null, null);
+                
+                if (capacityList == null){
+                	capacityList = storagePoolStatsList;
+                }else {
+                	capacityList.addAll(storagePoolStatsList);
+                }
 
                 for (CapacityVO capacity : capacityList) {
                     long dataCenterId = capacity.getDataCenterId();