diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 770dfbe0ca..e0e2d59ae6 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -49,6 +49,9 @@
 // the top-level call into C.
 static size_t external_call_depth = 0;
 
+// Emscripten defaults to a 64k C-stack, so our limit should be less than that.
+#define CSTACK_SIZE (32 * 1024)
+
 #if MICROPY_GC_SPLIT_HEAP_AUTO
 static void gc_collect_top_level(void);
 #endif
@@ -67,6 +70,8 @@ void external_call_depth_dec(void) {
 }
 
 void mp_js_init(int pystack_size, int heap_size) {
+    mp_cstack_init_with_sp_here(CSTACK_SIZE);
+
     #if MICROPY_ENABLE_PYSTACK
     mp_obj_t *pystack = (mp_obj_t *)malloc(pystack_size * sizeof(mp_obj_t));
     mp_pystack_init(pystack, pystack + pystack_size);
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 544e76f805..0783aacbbc 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -44,7 +44,6 @@
 #define MICROPY_READER_VFS          (MICROPY_VFS)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_PYSTACK      (1)
-#define MICROPY_STACK_CHECK         (0)
 #define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_REPL_EVENT_DRIVEN   (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)