diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/us_ticker.c
index a31e0ef4dd..d340a526b2 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/us_ticker.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/us_ticker.c
@@ -48,16 +48,10 @@ void set_compare(uint16_t count) {
 }
 
 // Used to increment the slave counter
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 static void tim_update_irq_handler(void) {
-    SlaveCounter++;
     if (TIM_GetITStatus(TIM_MST, TIM_IT_Update) == SET) {
         TIM_ClearITPendingBit(TIM_MST, TIM_IT_Update);
+        SlaveCounter++;
     }
 }
 
@@ -118,12 +112,6 @@ void us_ticker_init(void) {
     TIM_Cmd(TIM_MST, ENABLE);
 }
 
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 uint32_t us_ticker_read() {
     uint32_t counter, counter2;
     if (!us_ticker_inited) us_ticker_init();
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c
index 3862be6fd5..07bee5d67c 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F103RB/us_ticker.c
@@ -48,16 +48,10 @@ void set_compare(uint16_t count) {
 }
 
 // Used to increment the slave counter
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 static void tim_update_irq_handler(void) {
-    SlaveCounter++;
     if (TIM_GetITStatus(TIM_MST, TIM_IT_Update) == SET) {
         TIM_ClearITPendingBit(TIM_MST, TIM_IT_Update);
+        SlaveCounter++;
     }
 }
 
@@ -118,12 +112,6 @@ void us_ticker_init(void) {
     TIM_Cmd(TIM_MST, ENABLE);
 }
 
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 uint32_t us_ticker_read() {
     uint32_t counter, counter2;
     if (!us_ticker_inited) us_ticker_init();
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c
index 05f90f1ce9..e1088dec9a 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_F401RE/us_ticker.c
@@ -51,17 +51,11 @@ void set_compare(uint16_t count) {
 }
 
 // Used to increment the slave counter
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 static void tim_update_irq_handler(void) {
-    SlaveCounter++;
     if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_UPDATE) == SET) {
         __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_UPDATE);
         __HAL_TIM_SetCounter(&TimMasterHandle, 0); // Reset counter !!!
+        SlaveCounter++;
     }
 }
 
@@ -121,12 +115,6 @@ void us_ticker_init(void) {
     HAL_TIM_OC_Start(&TimMasterHandle, TIM_CHANNEL_1);
 }
 
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 uint32_t us_ticker_read() {
     uint32_t counter, counter2;
     if (!us_ticker_inited) us_ticker_init();
diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c
index 26cd2fa70c..87aa93dd26 100644
--- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c
+++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_NUCLEO_L152RE/us_ticker.c
@@ -46,12 +46,6 @@ void set_compare(uint16_t count) {
     TIM_ITConfig(TIM_MST, TIM_IT_CC1, ENABLE);
 }
 
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 static void tim_update_oc_irq_handler(void) {
     uint16_t cval = TIM_MST->CNT;
   
@@ -110,12 +104,6 @@ void us_ticker_init(void) {
     TIM_Cmd(TIM_MST, ENABLE);
 }
 
-#if defined(__CC_ARM) // Keil/MDK-ARM
-#pragma O0
-#pragma Ospace
-#elif defined(__IAR_SYSTEMS_ICC__) // IAR/EWARM
-#pragma optimize=low
-#endif
 uint32_t us_ticker_read() {
     uint32_t counter, counter2;
     if (!us_ticker_inited) us_ticker_init();