diff --git a/firmware/config/system/STM32F407xG_CCM.ld b/firmware/config/system/STM32F407xG_CCM.ld
index f235150f52..0aeee2c0fc 100644
--- a/firmware/config/system/STM32F407xG_CCM.ld
+++ b/firmware/config/system/STM32F407xG_CCM.ld
@@ -28,7 +28,7 @@
 /*
  * ST32F407xG memory setup.
  */
-__main_stack_size__     = 0x0600;
+__main_stack_size__     = 0x1000;
 __process_stack_size__  = 0x0600;
 
 MEMORY
diff --git a/firmware/config/system/chconf.h b/firmware/config/system/chconf.h
index 3b0acf6206..8340abbbec 100644
--- a/firmware/config/system/chconf.h
+++ b/firmware/config/system/chconf.h
@@ -50,8 +50,6 @@
 
 #define PORT_IDLE_THREAD_STACK_SIZE     1024
 
-#define PORT_INT_REQUIRED_STACK 		768
-
 #define CHPRINTF_USE_FLOAT          	TRUE
 
 /**
diff --git a/firmware/iar/ch.icf b/firmware/iar/ch.icf
index 8ff59ddf01..9eaec388be 100644
--- a/firmware/iar/ch.icf
+++ b/firmware/iar/ch.icf
@@ -16,7 +16,7 @@ define symbol __ICFEDIT_size_heap__   = 0x400;
 /**** End of ICF editor section. ###ICF###*/
 
 /* Size of the IRQ Stack (Main Stack).*/
-define symbol __ICFEDIT_size_irqstack__   = 0x400;
+define symbol __ICFEDIT_size_irqstack__   = 0x1000;
 
 define memory mem with size = 4G;
 define region ROM_region    = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__];