--- MultiPartParserDefinition.java
+++ MultiPartParserDefinition.java
@@ -21,6 +21,7 @@ package io.undertow.server.handlers.form;
 import io.undertow.UndertowLogger;
 import io.undertow.UndertowMessages;
 import io.undertow.UndertowOptions;
+import io.undertow.connector.PooledByteBuffer;
 import io.undertow.server.ExchangeCompletionListener;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
@@ -32,7 +33,6 @@ import io.undertow.util.SameThreadExecutor;
 import io.undertow.util.StatusCodes;
 import org.xnio.ChannelListener;
 import org.xnio.IoUtils;
-import io.undertow.connector.PooledByteBuffer;
 import org.xnio.channels.StreamSourceChannel;
 
 import java.io.ByteArrayOutputStream;
@@ -106,7 +106,7 @@ public class MultiPartParserDefinition implements FormParserFactory.ParserDefini
                 }
             });
             Long sizeLimit = exchange.getConnection().getUndertowOptions().get(UndertowOptions.MULTIPART_MAX_ENTITY_SIZE, UndertowOptions.DEFAULT_MULTIPART_MAX_ENTITY_SIZE );
-            if(sizeLimit != null) {
+            if(sizeLimit != null && sizeLimit > 0) {
                 exchange.setMaxEntitySize(sizeLimit);
             }
             UndertowLogger.REQUEST_LOGGER.tracef("Created multipart parser for %s", exchange);
