diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs index 21ae19f4..66552cfb 100644 --- a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs @@ -204,6 +204,11 @@ public class TimePicker : Control private static object CoerceSelectedTime(DependencyObject d, object value) { var dp = (TimePicker) d; + if (dp.Clock is null) + { + return (DateTime?) value; + } + dp.Clock.SelectedTime = (DateTime?) value; return dp.Clock.SelectedTime; }