diff --git a/src/machine/machine_rp2040_usb.go b/src/machine/machine_rp2040_usb.go
index ce94ec94..1d30be6f 100644
--- a/src/machine/machine_rp2040_usb.go
+++ b/src/machine/machine_rp2040_usb.go
@@ -101,6 +101,7 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
 		}
 
 		s2 := rp.USBCTRL_REGS.BUFF_STATUS.Get()
+		rp.USBCTRL_REGS.BUFF_STATUS.Set(s2)
 
 		// OUT (PC -> rp2040)
 		for i := 0; i < 16; i++ {
@@ -121,8 +122,6 @@ func handleUSBIRQ(intr interrupt.Interrupt) {
 				}
 			}
 		}
-
-		rp.USBCTRL_REGS.BUFF_STATUS.Set(0xFFFFFFFF)
 	}
 
 	// Bus is reset