diff --git a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
index 085722c3e..100539410 100644
--- a/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
+++ b/os/hal/ports/STM32/LLD/OTGv1/usb_lld.c
@@ -760,7 +760,7 @@ void usb_lld_init(void) {
                     (uint8_t *)wsp + sizeof(thread_t),
                     CH_DBG_THREAD_FILL_VALUE);
     _thread_memfill((uint8_t *)wsp + sizeof(thread_t),
-                    (uint8_t *)wsp + sizeof(USBD1.wa_pump) - sizeof(thread_t),
+                    (uint8_t *)wsp + sizeof(USBD1.wa_pump),
                     CH_DBG_STACK_FILL_VALUE);
   }
 #endif /* CH_DBG_FILL_THREADS */
@@ -784,7 +784,7 @@ void usb_lld_init(void) {
                     (uint8_t *)wsp + sizeof(thread_t),
                     CH_DBG_THREAD_FILL_VALUE);
     _thread_memfill((uint8_t *)wsp + sizeof(thread_t),
-                    (uint8_t *)wsp + sizeof(USBD2.wa_pump) - sizeof(thread_t),
+                    (uint8_t *)wsp + sizeof(USBD2.wa_pump),
                     CH_DBG_STACK_FILL_VALUE);
   }
 #endif /* CH_DBG_FILL_THREADS */