diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32G474RE-NUCLEO64/Makefile
index 0fc40b97a..642e65e68 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64/Makefile
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64/Makefile
@@ -105,7 +105,7 @@ include $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_G474RE/board.mk
 include $(CHIBIOS)/os/hal/osal/rt-nil/osal.mk
 # RTOS files (optional).
 include $(CHIBIOS)/os/rt/rt.mk
-include $(CHIBIOS)/os/common/ports/ARMv7-M/compilers/GCC/mk/port.mk
+include $(CHIBIOS)/os/common/ports/ARMv7-M-ALT/compilers/GCC/mk/port.mk
 # Auto-build files in ./source recursively.
 include $(CHIBIOS)/tools/mk/autobuild.mk
 # Other files (optional).
diff --git a/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h b/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h
index 7a6d3c49c..fd30e8afb 100644
--- a/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h
+++ b/demos/STM32/RT-STM32G474RE-NUCLEO64/cfg/chconf.h
@@ -620,7 +620,7 @@
  *          @p panic_msg variable set to @p NULL.
  */
 #if !defined(CH_DBG_ENABLE_STACK_CHECK)
-#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#define CH_DBG_ENABLE_STACK_CHECK           TRUE
 #endif
 
 /**