diff --git a/README.md b/README.md
index ec6564b469fe110add6b7796a4252ad4abd967f0..7c46c737228f001be9cae27c0875ab8f813d8b19 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ docker-compose up -d --build
 | --port        | Set port to bind the server to | `5000`               |
 | --char-limit        | Set character limit | `No limit`               |
 | --req-limit        | Set maximum number of requests per minute per client | `No limit`               |
+| --batch-limit        | Set maximum number of texts to translate in a batch request | `No limit`               |
 | --ga-id        | Enable Google Analytics on the API client page by providing an ID | `No tracking`               |
 | --debug      | Enable debug environment | `False`           |
 | --ssl        | Whether to enable SSL | `False`               |
diff --git a/app/app.py b/app/app.py
index f398b8b7be610ed2ddc9d93c29be6ecfade60ce6..79634f8417c9975273e48222f2b651d0bc7aff48 100644
--- a/app/app.py
+++ b/app/app.py
@@ -13,7 +13,7 @@ def get_remote_address():
 
     return ip
 
-def create_app(char_limit=-1, req_limit=-1, ga_id=None, debug=False, frontend_language_source="en", frontend_language_target="en"):
+def create_app(char_limit=-1, req_limit=-1, batch_limit=-1, ga_id=None, debug=False, frontend_language_source="en", frontend_language_target="en"):
     from app.init import boot
     boot()
 
@@ -207,6 +207,11 @@ def create_app(char_limit=-1, req_limit=-1, ga_id=None, debug=False, frontend_la
 
         batch = isinstance(q, list)
 
+        if batch and batch_limit != -1:
+          batch_size = len(q)
+          if batch_limit < batch_size:
+            abort(400, description="Invalid request: Request (%d) exceeds text limit (%d)" % (batch_size, batch_limit))
+
         if char_limit != -1:
             if batch:
               chars = sum([len(text) for text in q])
diff --git a/main.py b/main.py
index 36e4ef621faa042b52e7f460beaa5c23e3b545d9..47e7c4342c8312a5599f5eb7c7926c9986984557 100644
--- a/main.py
+++ b/main.py
@@ -10,6 +10,8 @@ parser.add_argument('--char-limit', default=-1, type=int, metavar="<number of ch
                     help='Set character limit (%(default)s)')
 parser.add_argument('--req-limit', default=-1, type=int, metavar="<number>",
                     help='Set maximum number of requests per minute per client (%(default)s)')
+parser.add_argument('--batch-limit', default=-1, type=int, metavar="<number of texts>",
+                    help='Set maximum number of texts to translate in a batch request (%(default)s)')
 parser.add_argument('--ga-id', type=str, default=None, metavar="<GA ID>",
                     help='Enable Google Analytics on the API client page by providing an ID (%(default)s)')
 parser.add_argument('--debug', default=False, action="store_true",
@@ -25,8 +27,9 @@ args = parser.parse_args()
 
 
 if __name__ == "__main__":
-    app = create_app(char_limit=args.char_limit, 
+    app = create_app(char_limit=args.char_limit,
                      req_limit=args.req_limit,
+                     batch_limit=args.batch_limit,
                      ga_id=args.ga_id,
                      debug=args.debug,
                      frontend_language_source=args.frontend_language_source,