diff --git a/json-generator/src/main/java/io/apptik/json/generator/generators/ArrayGenerator.java b/json-generator/src/main/java/io/apptik/json/generator/generators/ArrayGenerator.java
index 2136104..7adf693 100644
--- a/json-generator/src/main/java/io/apptik/json/generator/generators/ArrayGenerator.java
+++ b/json-generator/src/main/java/io/apptik/json/generator/generators/ArrayGenerator.java
@@ -43,8 +43,8 @@ public JsonArray generate() {
         JsonArray res = new JsonArray();
         SchemaList items = schema.getItems();
         JsonElement  newEl;
-        int minItems = schema.getMinItems();
-        int maxItems = schema.getMaxItems();
+        Integer minItems = schema.getMinItems();
+        Integer maxItems = schema.getMaxItems();
 
         if(configuration!=null) {
             if (configuration.globalArrayItemsMin!=null) minItems = configuration.globalArrayItemsMin;
@@ -55,6 +55,12 @@ public JsonArray generate() {
 
             }
         }
+        if (minItems == null) {
+            minItems = (maxItems != null && maxItems <= 1) ? 0 : 1;
+        }
+        if (maxItems == null) {
+            maxItems = 500;
+        }
         maxItems = minItems + rnd.nextInt(maxItems-minItems);