diff --git a/cores/arduino/Tone.cpp b/cores/arduino/Tone.cpp
index 37b6b0b0d..010a0c497 100644
--- a/cores/arduino/Tone.cpp
+++ b/cores/arduino/Tone.cpp
@@ -169,7 +169,10 @@ void noTone (uint8_t outputPin)
    */
   if(firstTimeRunning)
   {
+    NVIC_DisableIRQ(TONE_TC_IRQn);
     resetTC(TONE_TC);
+    NVIC_EnableIRQ(TONE_TC_IRQn);
+
     digitalWrite(outputPin, LOW);
     toneIsActive = false;
   }