diff --git a/lib/serve.js b/lib/serve.js
index 2bcc91ed..1420bdbd 100644
--- a/lib/serve.js
+++ b/lib/serve.js
@@ -69,7 +69,7 @@ function createHandler(dir, static) {
     var lambdaRequest = {
       path: request.path,
       httpMethod: request.method,
-      queryStringParameters: queryString.parse(request.url.split("?")[1]),
+      queryStringParameters: queryString.parse(request.url.split(/\?(.+)/)[1]),
       headers: request.headers,
       body: isBase64 ? Buffer.from(request.body.toString(), "utf8").toString("base64") : request.body,
       isBase64Encoded: isBase64