diff --git a/server/src/com/cloud/storage/download/DownloadListener.java b/server/src/com/cloud/storage/download/DownloadListener.java
index 4eef22bb663..bc2efbd4413 100644
--- a/server/src/com/cloud/storage/download/DownloadListener.java
+++ b/server/src/com/cloud/storage/download/DownloadListener.java
@@ -92,7 +92,7 @@ public class DownloadListener implements Listener {
 
 	public static final Logger s_logger = Logger.getLogger(DownloadListener.class.getName());
 	public static final int SMALL_DELAY = 100;
-	public static final long STATUS_POLL_INTERVAL = 10000L;
+	public static final long STATUS_POLL_INTERVAL = 30000L;
 	
 	public static final String DOWNLOADED=Status.DOWNLOADED.toString();
 	public static final String NOT_DOWNLOADED=Status.NOT_DOWNLOADED.toString();
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index 3becd29a8dd..9e9fca8a088 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -383,13 +383,9 @@ public class DownloadMonitorImpl implements  DownloadMonitor {
 	public void handleDownloadEvent(HostVO host, VMTemplateVO template, Status dnldStatus) {
 		if ((dnldStatus == VMTemplateStorageResourceAssoc.Status.DOWNLOADED) || (dnldStatus==Status.ABANDONED)){
 			VMTemplateHostVO vmTemplateHost = new VMTemplateHostVO(host.getId(), template.getId());
-			DownloadListener oldListener = null;
 	        synchronized (_listenerMap) {
-	            oldListener = _listenerMap.remove(vmTemplateHost);
+	            _listenerMap.remove(vmTemplateHost);
 	        }
-			if (oldListener != null) {
-			    oldListener.abandon();
-			}
 		}
 		
 		VMTemplateHostVO vmTemplateHost = _vmTemplateHostDao.findByHostTemplate(host.getId(), template.getId());