diff --git a/src/HamShield.cpp b/src/HamShield.cpp
index 20c15ef..b9f6354 100644
--- a/src/HamShield.cpp
+++ b/src/HamShield.cpp
@@ -1615,11 +1615,11 @@ void HamShield::morseOut(char buffer[HAMSHIELD_MORSE_BUFFER_SIZE]) {
         if(bits & 1) {
           HStone(hs_pwm_pin, morse_freq); //, morse_dot_millis * 3);
           HSdelay(morse_dot_millis*3);
-          HSnoTone();
+          HSnoTone(hs_pwm_pin);
         } else {
           HStone(hs_pwm_pin, morse_freq); //, morse_dot_millis);
           HSdelay(morse_dot_millis);
-          HSnoTone();
+          HSnoTone(hs_pwm_pin);
         }
         //tone(hs_pwm_pin, 6000, morse_dot_millis);
         HSnoTone(hs_pwm_pin);
@@ -1762,7 +1762,7 @@ void HamShield::SSTVTestPattern(int code) {
 void HamShield::toneWait(uint16_t freq, long timer) { 
     HStone(hs_pwm_pin,freq); //,timer);
     HSdelay(timer);
-    HSnoTone();
+    HSnoTone(hs_pwm_pin);
 }
 
 /* wait microseconds for tone to complete */