diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java
index 5f933e81db0..9055656bb26 100755
--- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java
+++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java
@@ -151,7 +151,7 @@ public class RegisterTemplateCmd extends BaseCmd {
         List<TemplateResponse> responses = new ArrayList<TemplateResponse>();
         List<DataCenterVO> zones = null;
 
-        if (zoneId != null) {
+        if ((zoneId != null) && (zoneId != -1)) {
             zones = new ArrayList<DataCenterVO>();
             zones.add(ApiDBUtils.findZoneById(zoneId));
         } else {