diff --git a/src/Controls/src/Core/TimePicker/TimePicker.cs b/src/Controls/src/Core/TimePicker/TimePicker.cs
index 68a628596cd0..516c1d3f01de 100644
--- a/src/Controls/src/Core/TimePicker/TimePicker.cs
+++ b/src/Controls/src/Core/TimePicker/TimePicker.cs
@@ -222,7 +222,7 @@ void ITextElement.OnTextTransformChanged(TextTransform oldValue, TextTransform n
 		static void TimePropertyChanged(BindableObject bindable, object oldValue, object newValue)
 		{
 			if (bindable is TimePicker timePicker)
-				timePicker.TimeSelected?.Invoke(timePicker, new TimeChangedEventArgs((TimeSpan)oldValue, (TimeSpan)newValue));
+				timePicker.TimeSelected?.Invoke(timePicker, new TimeChangedEventArgs((TimeSpan?)oldValue, (TimeSpan?)newValue));
 		}
 
 		private protected override string GetDebuggerDisplay()