diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 453b7ba..87463fe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
         required: false
 
 env:
-  EM_VERSION: 3.1.14
+  EM_VERSION: 3.1.25
   EM_CACHE_FOLDER: 'emsdk-cache'
   BUILD_TYPE: Release
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5acbb09..64c1e95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,12 +19,12 @@ if (EMSCRIPTEN)
                 OR using 'emcmake cmake ..' to build")
     endif ()
 
-    set(MIN_VERSION "3.1.14")
-    set(MAX_VERSION "3.1.25")
+    set(MIN_VERSION "3.1.25")
+    set(MAX_VERSION "3.2.0")
     if (${EMSCRIPTEN_VERSION} VERSION_LESS MIN_VERSION)
         message(FATAL_ERROR "EMSCRIPTEN version looks too old. Was ${EMSCRIPTEN_VERSION}, should be at least ${MIN_VERSION}.")
     endif ()
-    if (${EMSCRIPTEN_VERSION} VERSION_GREATER MAX_VERSION)
+    if (${EMSCRIPTEN_VERSION} VERSION_GREATER_EQUAL MAX_VERSION)
         message(FATAL_ERROR "EMSCRIPTEN version is too new. Was ${EMSCRIPTEN_VERSION}, should be at least ${MAX_VERSION}.")
     endif ()
 
@@ -89,7 +89,7 @@ if (EMSCRIPTEN)
         "SHELL:-s NO_DISABLE_EXCEPTION_CATCHING"
         "SHELL:-s INITIAL_MEMORY=256MB"
         "SHELL:-s DEFAULT_PTHREAD_STACK_SIZE=64KB"
-        "SHELL:-s STACK_SIZE=64KB" # TODO: Once the minimum version of em++ > 3.1.25, please change this to TOTAL_STACK
+        "SHELL:-s TOTAL_SIZE=64KB"
         "SHELL:-s WASM=1"
         "SHELL:-s ALLOW_MEMORY_GROWTH"
         "SHELL:-s FORCE_FILESYSTEM=1"