diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java
index 372242b3c11..1cb60106513 100755
--- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java
+++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java
@@ -122,7 +122,7 @@ public class RegisterIsoCmd 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 {