diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
old mode 100644
new mode 100755
index 6cee40370ed..3323bf49bbf
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -80,7 +80,7 @@ import com.sun.mail.smtp.SMTPTransport;
 public class AlertManagerImpl implements AlertManager {
     private static final Logger s_logger = Logger.getLogger(AlertManagerImpl.class.getName());
 
-    private static final long INITIAL_DELAY = 5L * 60L * 1000L; // five minutes expressed in milliseconds
+    private static final long INITIAL_CAPACITY_CHECK_DELAY = 30L * 1000L; // five minutes expressed in milliseconds
 
     private static final DecimalFormat _dfPct = new DecimalFormat("###.##");
     private static final DecimalFormat _dfWhole = new DecimalFormat("########");
@@ -201,7 +201,7 @@ public class AlertManagerImpl implements AlertManager {
 
     @Override
     public boolean start() {
-        _timer.schedule(new CapacityChecker(), INITIAL_DELAY, _capacityCheckPeriod);
+        _timer.schedule(new CapacityChecker(), INITIAL_CAPACITY_CHECK_DELAY, _capacityCheckPeriod);
         return true;
     }
 
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 918e2e9447e..4978db7335f 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3151,7 +3151,6 @@ public class ManagementServerImpl implements ManagementServer {
         // NOTE: listCapacities is currently called by the UI only, so this
         // shouldn't be called much since it checks all hosts/VMs
         // to figure out what has been allocated.
-        _alertMgr.recalculateCapacity();
 
         Filter searchFilter = new Filter(CapacityVO.class, "capacityType", true, cmd.getStartIndex(), cmd.getPageSizeVal());
         SearchCriteria<CapacityVO> sc = _capacityDao.createSearchCriteria();