diff --git a/api/src/com/cloud/api/BaseListCmd.java b/api/src/com/cloud/api/BaseListCmd.java
index bad05e55e68..de98b0a36d5 100755
--- a/api/src/com/cloud/api/BaseListCmd.java
+++ b/api/src/com/cloud/api/BaseListCmd.java
@@ -6,7 +6,7 @@ import com.cloud.exception.InvalidParameterValueException;
 
 public abstract class BaseListCmd extends BaseCmd {
 
-    private static final Long MAX_PAGESIZE = _configService.getDefaultPageSize();
+    private static Long MAX_PAGESIZE = 500L;
 
 	/////////////////////////////////////////////////////
     /////////// BaseList API parameters /////////////////
@@ -38,6 +38,11 @@ public abstract class BaseListCmd extends BaseCmd {
         return pageSize;
     }
     
+    
+    static void configure() {
+        MAX_PAGESIZE = _configService.getDefaultPageSize();
+    }
+    
     @Override
     public long getEntityOwnerId() {
         //no owner is needed for list command
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 5ed57bb25b2..0659b420cdb 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -161,6 +161,7 @@ public class ApiServer implements HttpRequestHandler {
     public void init(String[] apiConfig) {
         try {
             BaseCmd.setComponents(new ApiResponseHelper());
+            BaseListCmd.configure();
             _apiCommands = new Properties();
             Properties preProcessedCommands = new Properties();
             if (apiConfig != null) {