diff --git a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java
index 6e17f9a862a..605e332627d 100644
--- a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java
+++ b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java
@@ -89,7 +89,13 @@ public class ListDomainChildrenCmd extends BaseCmd {
             }
         }
         
-        Criteria c = new Criteria("id", Boolean.TRUE, startIndex, Long.valueOf(pageSizeNum));
+        //temporary solution at API level. We need a permanent solution for all "listXXXXXXX & pageSize = -1" in the future.
+        Criteria c;
+        if(pageSizeNum != -1)
+            c = new Criteria("id", Boolean.TRUE, startIndex, Long.valueOf(pageSizeNum));
+        else
+        	c = new Criteria("id", Boolean.TRUE, null, null);
+        
         
         if (keyword != null) {
         	c.addCriteria(Criteria.KEYWORD, keyword);
diff --git a/server/src/com/cloud/api/commands/ListDomainsCmd.java b/server/src/com/cloud/api/commands/ListDomainsCmd.java
index 6b503a14fee..b722e9f1951 100644
--- a/server/src/com/cloud/api/commands/ListDomainsCmd.java
+++ b/server/src/com/cloud/api/commands/ListDomainsCmd.java
@@ -85,7 +85,13 @@ public class ListDomainsCmd extends BaseCmd {
                 startIndex = Long.valueOf(pageSizeNum * (pageNum-1));
             }
         }
-        Criteria c = new Criteria("id", Boolean.TRUE, startIndex, Long.valueOf(pageSizeNum));
+        
+        //temporary solution at API level. We need a permanent solution for all "listXXXXXXX & pageSize = -1" in the future.
+        Criteria c;
+        if(pageSizeNum != -1)
+            c = new Criteria("id", Boolean.TRUE, startIndex, Long.valueOf(pageSizeNum));
+        else
+        	c = new Criteria("id", Boolean.TRUE, null, null);
         
         if (keyword != null) {
         	c.addCriteria(Criteria.KEYWORD, keyword);
diff --git a/ui/scripts/cloud.core.domains.js b/ui/scripts/cloud.core.domains.js
index 921b158b177..7e57eebc5e1 100644
--- a/ui/scripts/cloud.core.domains.js
+++ b/ui/scripts/cloud.core.domains.js
@@ -66,7 +66,11 @@ function showDomainsTab() {
     
     function drawTree(id, level, container) {		        
         $.ajax({
+<<<<<<< HEAD
 	   data: createURL("command=listDomainChildren&id="+id+"&response=json"),
+=======
+		    data: "command=listDomainChildren&id="+id+"&response=json&pageSize=-1",
+>>>>>>> e8446f8... Issue #: 5975
 		    dataType: "json",
 		    async: false,
 		    success: function(json) {					        
@@ -321,7 +325,11 @@ function showDomainsTab() {
 	    rightPanelSearchResult.show();	                	        	
         var keyword = searchInput.val();             
         $.ajax({
+<<<<<<< HEAD
 	   data: createURL("command=listDomains&keyword="+keyword+"&response=json"+maxPageSize),
+=======
+	        data: "command=listDomains&keyword="+keyword+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
+>>>>>>> e8446f8... Issue #: 5975
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {					        
@@ -350,7 +358,11 @@ function showDomainsTab() {
 	function drawRootNode(rootDomainId) {
 	    treeContentBox.empty();
 	    $.ajax({
+<<<<<<< HEAD
 		   data: createURL("command=listDomains&id="+rootDomainId+"&response=json"),
+=======
+	        data: "command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1", //pageSize=-1 will return all items (no limitation)
+>>>>>>> e8446f8... Issue #: 5975
 	        dataType: "json",
 	        async: false,
 	        success: function(json) {