diff --git a/server/src/com/cloud/storage/dao/VMTemplateHostDao.java b/server/src/com/cloud/storage/dao/VMTemplateHostDao.java
index ef8812d58a0..cefe359cff0 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateHostDao.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateHostDao.java
@@ -55,5 +55,7 @@ public interface VMTemplateHostDao extends GenericDao<VMTemplateHostVO, Long> {
     List<VMTemplateHostVO> listDestroyed(long hostId);
 
     boolean templateAvailable(long templateId, long hostId);
+
+    List<VMTemplateHostVO> listByZoneTemplate(long dcId, long templateId);
 	
 }
diff --git a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
index 1bd94834282..a9387fc1c0c 100755
--- a/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
+++ b/server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
@@ -29,7 +29,6 @@ import java.util.TimeZone;
 import javax.ejb.Local;
 
 import org.apache.log4j.Logger;
-
 import com.cloud.storage.VMTemplateHostVO;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.utils.DateUtil;
@@ -39,7 +38,7 @@ import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.Transaction;
 
 @Local(value={VMTemplateHostDao.class})
-public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long> implements VMTemplateHostDao {
+public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long> implements VMTemplateHostDao {
 	public static final Logger s_logger = Logger.getLogger(VMTemplateHostDaoImpl.class.getName());
 	
 	protected final SearchBuilder<VMTemplateHostVO> HostSearch;
@@ -50,7 +49,7 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
 	protected final SearchBuilder<VMTemplateHostVO> HostTemplatePoolSearch;
 	protected final SearchBuilder<VMTemplateHostVO> TemplateStatusSearch;
 	protected final SearchBuilder<VMTemplateHostVO> TemplateStatesSearch;
-	
+
 	
 	protected static final String UPDATE_TEMPLATE_HOST_REF =
 		"UPDATE type_host_ref SET download_state = ?, download_pct= ?, last_updated = ? "
@@ -72,8 +71,12 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
 		"SELECT * FROM template_host_ref t "
 	+	" where t.template_id=? and t.download_state=?";
 	
-
-		
+    protected static final String ZONE_TEMPLATE_SEARCH=
+        "SELECT t.id, t.host_id, t.pool_id, t.template_id, t.created, t.last_updated, t.job_id, " 
+    +   "t.download_pct, t.size, t.physical_size, t.download_state, t.error_str, t.local_path, "
+    +   "t.install_path, t.url, t.destroyed, t.is_copy FROM template_host_ref t, host h"
+    +   " where t.host_id = h.id and h.data_center_id=? and t.template_id=? ";
+	
 	public VMTemplateHostDaoImpl () {
 		HostSearch = createSearchBuilder();
 		HostSearch.and("host_id", HostSearch.entity().getHostId(), SearchCriteria.Op.EQ);
@@ -153,6 +156,7 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
 	    return listIncludingRemovedBy(sc);
 	}
 	
+	
 	@Override
 	public List<VMTemplateHostVO> listByOnlyTemplateId(long templateId) {
 	    SearchCriteria<VMTemplateHostVO> sc = TemplateSearch.create();
@@ -166,8 +170,8 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
 	    sc.setParameters("host_id", hostId);
 	    sc.setParameters("template_id", templateId);
 	    return findOneIncludingRemovedBy(sc);
-	}
-
+	}
+	
 	@Override
 	public List<VMTemplateHostVO> listByTemplateStatus(long templateId, VMTemplateHostVO.Status downloadState) {
 		SearchCriteria<VMTemplateHostVO> sc = TemplateStatusSearch.create();
@@ -269,7 +273,29 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase<VMTemplateHostVO, Long
 	    sc.setParameters("template_id", templateId);
 	    return listIncludingRemovedBy(sc);
 	}
-
+
+    @Override
+    public List<VMTemplateHostVO> listByZoneTemplate(long dcId, long templateId) {
+        Transaction txn = Transaction.currentTxn();
+        PreparedStatement pstmt = null;
+        List<VMTemplateHostVO> result = new ArrayList<VMTemplateHostVO>();
+        try {
+            String sql = ZONE_TEMPLATE_SEARCH;
+            pstmt = txn.prepareStatement(sql);
+            
+            pstmt.setLong(1, dcId);
+            pstmt.setLong(2, templateId);
+            ResultSet rs = pstmt.executeQuery();
+            while (rs.next()) {
+                result.add(toEntityBean(rs, false));
+            }
+            
+        } catch (Exception e) {
+            s_logger.warn("Exception: ", e);
+        }
+        return result;
+    }
+	
 	@Override
 	public List<VMTemplateHostVO> listByTemplatePool(long templateId, long poolId) {
 		SearchCriteria<VMTemplateHostVO> sc = PoolTemplateSearch.create();
diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index f1f6434729d..7d4cdd07f35 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -20,6 +20,7 @@ package com.cloud.storage.download;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -525,6 +526,25 @@ public class DownloadMonitorImpl implements  DownloadMonitor {
         
         return null;
     }
+    
+    private List<VMTemplateVO> listAllInZone(long dcId){
+        List<VMTemplateVO> tmplts = _templateDao.listAllInZone(dcId);
+        Iterator<VMTemplateVO> iter = tmplts.iterator();
+        while ( iter.hasNext() ) {
+            VMTemplateVO tmplt = iter.next();
+            if( tmplt.isPublicTemplate() || tmplt.isFeatured() ) {
+                continue;
+            }
+            List<VMTemplateHostVO> tmpltHosts = _vmTemplateHostDao.listByZoneTemplate(dcId, tmplt.getId());
+            for ( VMTemplateHostVO tmpltHost : tmpltHosts ) {
+               if ( tmpltHost.getDownloadState() == Status.DOWNLOADED || tmpltHost.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) {
+                   iter.remove();
+                   continue;
+               }
+            }
+        }
+        return tmplts;       
+    }
 	
 	@Override
 	public void handleTemplateSync(HostVO ssHost) {
@@ -544,7 +564,7 @@ public class DownloadMonitorImpl implements  DownloadMonitor {
 		long zoneId = ssHost.getDataCenterId();
 
 		Set<VMTemplateVO> toBeDownloaded = new HashSet<VMTemplateVO>();
-		List<VMTemplateVO> allTemplates = _templateDao.listAllInZone(ssHost.getDataCenterId());
+		List<VMTemplateVO> allTemplates = listAllInZone(ssHost.getDataCenterId());
 		List<VMTemplateVO> rtngTmplts = _templateDao.listAllSystemVMTemplates();
 		List<VMTemplateVO> defaultBuiltin = _templateDao.listDefaultBuiltinTemplates();