diff --git a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
index 628ad64c0dc..c8aac27da8c 100644
--- a/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
+++ b/core/src/com/cloud/storage/template/HttpTemplateDownloader.java
@@ -250,6 +250,13 @@ public class HttpTemplateDownloader implements TemplateDownloader {
             	}
             } else {
             	remoteSize2 = Long.parseLong(contentLengthHeader.getValue());
+                if ( remoteSize2 == 0 ) {
+                    status = TemplateDownloader.Status.DOWNLOAD_FINISHED;
+                    String downloaded = "(download complete remote=" + remoteSize + "bytes)";
+                    errorString = "Downloaded " + totalBytes + " bytes " + downloaded;
+                    downloadTime = 0;
+                    return 0;
+                }
             }
 
             if (remoteSize == 0) {