diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
index 11a499b..6db01b6 100644
--- a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
+++ b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -1105,6 +1105,9 @@ public class S3ProxyHandler {
             } catch (NumberFormatException nfe) {
                 throw new S3Exception(S3ErrorCode.INVALID_ARGUMENT, nfe);
             }
+            if (maxKeys > 1000) {
+                maxKeys = 1000;
+            }
         }
         options.maxResults(maxKeys);