diff --git a/source/Makefile.mk b/source/Makefile.mk
index 20b2bbf2e..269841733 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -115,6 +115,8 @@ ifeq ($(WIN32),true)
 # mingw has issues with this specific optimization
 # See https://github.com/falkTX/Carla/issues/696
 BASE_OPTS  += -fno-rerun-cse-after-loop
+# See https://github.com/falkTX/Carla/issues/855
+BASE_OPTS  += -mstackrealign
 ifeq ($(BUILDING_FOR_WINDOWS),true)
 BASE_FLAGS += -DBUILDING_CARLA_FOR_WINDOWS
 endif