diff --git a/full/Makefile b/full/Makefile
index 104f718..8411c45 100644
--- a/full/Makefile
+++ b/full/Makefile
@@ -64,6 +64,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 65e6f56..132c90b 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -69,6 +69,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
@@ -91,4 +94,4 @@ clean:
 clean-cache:
 	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
\ No newline at end of file
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
diff --git a/versions/13/Makefile b/versions/13/Makefile
index 316b104..8fcda8d 100644
--- a/versions/13/Makefile
+++ b/versions/13/Makefile
@@ -72,6 +72,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
@@ -94,4 +97,4 @@ clean:
 clean-cache:
 	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
\ No newline at end of file
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
diff --git a/versions/14/Makefile b/versions/14/Makefile
index 1c296d0..cfacf69 100644
--- a/versions/14/Makefile
+++ b/versions/14/Makefile
@@ -69,6 +69,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
@@ -91,4 +94,4 @@ clean:
 clean-cache:
 	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
\ No newline at end of file
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
diff --git a/versions/15/Makefile b/versions/15/Makefile
index c2321c3..f2c0398 100644
--- a/versions/15/Makefile
+++ b/versions/15/Makefile
@@ -71,6 +71,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
@@ -93,4 +96,4 @@ clean:
 clean-cache:
 	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
\ No newline at end of file
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
diff --git a/versions/16/Makefile b/versions/16/Makefile
index 7985521..06440cc 100644
--- a/versions/16/Makefile
+++ b/versions/16/Makefile
@@ -69,6 +69,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
@@ -91,4 +94,4 @@ clean:
 clean-cache:
 	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
\ No newline at end of file
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
diff --git a/versions/17/Makefile b/versions/17/Makefile
index 4083593..e1dfba5 100644
--- a/versions/17/Makefile
+++ b/versions/17/Makefile
@@ -69,6 +69,9 @@ ifdef EMSCRIPTEN
 		-sMODULARIZE=1 \
 		-sEXPORT_ES6=0 \
 		-sALLOW_MEMORY_GROWTH=1 \
+		-sINITIAL_MEMORY=134217728 \
+		-sMAXIMUM_MEMORY=1073741824 \
+        -sSTACK_SIZE=33554432 \
 		-lpg_query \
 		-o $@ \
 		$(SRC_FILES)
@@ -91,4 +94,4 @@ clean:
 clean-cache:
 	-@ rm -rf $(LIBPG_QUERY_DIR)
 
-.PHONY: build build-cache rebuild rebuild-cache clean clean-cache
\ No newline at end of file
+.PHONY: build build-cache rebuild rebuild-cache clean clean-cache