diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5687916ab..a56908713 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,6 +64,10 @@ jobs:
             make
             ccache -s
 
+      - run:
+          name: check-size
+          command: ls -lh build/
+
       - save_cache:
           paths:
             - ./emsdk/emsdk
diff --git a/Makefile b/Makefile
index 91839a04b..27e2b9698 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ LDFLAGS=\
 	-std=c++14 \
   -lstdc++ \
   --memory-init-file 0 \
+  -s "BINARYEN_TRAP_MODE='clamp'" \
   -s TEXTDECODER=0 \
   -s LZ4=1
 
diff --git a/Makefile.envs b/Makefile.envs
index 0e93fe0fc..dcc1704f7 100644
--- a/Makefile.envs
+++ b/Makefile.envs
@@ -21,4 +21,5 @@ export SIDE_LDFLAGS=\
   -s EMULATE_FUNCTION_POINTER_CASTS=1 \
   -s SIDE_MODULE=1 \
 	-s WASM=1 \
+  -s "BINARYEN_TRAP_MODE='clamp'" \
   --memory-init-file 0