diff --git a/Source/Meadow.Foundation.Core/Speakers/PiezoSpeaker.cs b/Source/Meadow.Foundation.Core/Speakers/PiezoSpeaker.cs
index e7a3ce76f7..e2d3ce3a6f 100644
--- a/Source/Meadow.Foundation.Core/Speakers/PiezoSpeaker.cs
+++ b/Source/Meadow.Foundation.Core/Speakers/PiezoSpeaker.cs
@@ -1,6 +1,7 @@
 using Meadow.Hardware;
 using Meadow.Peripherals.Speakers;
 using Meadow.Units;
+using System;
 using System.Threading.Tasks;
 
 namespace Meadow.Foundation.Audio
@@ -32,8 +33,6 @@ public PiezoSpeaker(IPwmOutputController device, IPin pin, Frequency frequency,
         /// </summary>
         /// <param name="device">IPwmOutputController to create PWM port</param>
         /// <param name="pin">PWM Pin connected to the PiezoSpeaker</param>
-        /// <param name="frequency">PWM frequency</param>
-        /// <param name="dutyCycle">Duty cycle</param>
         public PiezoSpeaker(IPwmOutputController device, IPin pin) :
             this(device.CreatePwmPort(pin, new Frequency(100, Frequency.UnitType.Hertz), 0))
         { }
@@ -48,16 +47,25 @@ public PiezoSpeaker(IPwmPort port)
             Port.Start();
         }
 
+        /// <summary>
+        /// Play a frequency until stopped by StopTone
+        /// </summary>
+        /// <param name="frequency">The frequency in hertz of the tone to be played</param>
+        public Task PlayTone(Frequency frequency)
+        {
+            return PlayTone(frequency, TimeSpan.Zero);
+        }
+
         /// <summary>
         /// Play a frequency for a specified duration
         /// </summary>
         /// <param name="frequency">The frequency in hertz of the tone to be played</param>
         /// <param name="duration">How long the note is played in milliseconds, if durration is 0, tone plays indefinitely</param>
-        public async Task PlayTone(Frequency frequency, int duration = 0)
+        public async Task PlayTone(Frequency frequency, TimeSpan duration)
         {
             if (frequency.Hertz <= 1)
             {
-                throw new System.Exception("Piezo frequency must be greater than 1Hz");
+                throw new Exception("Piezo frequency must be greater than 1Hz");
             }
 
             if (!isPlaying)
@@ -67,7 +75,7 @@ public async Task PlayTone(Frequency frequency, int duration = 0)
                 Port.Frequency = frequency;
                 Port.DutyCycle = 0.5f;
 
-                if (duration > 0)
+                if (duration.TotalMilliseconds > 0)
                 {
                     await Task.Delay(duration);
                     Port.DutyCycle = 0f;