diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
index 0005e07536..8dffc43d91 100644
--- a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
+++ b/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
@@ -291,8 +291,7 @@ namespace Avalonia.Controls
             // Text
             else if (change.Property == TextProperty)
             {
-                var oldValue = change.GetOldValue<string>();
-                var value = change.GetNewValue<string>();
+                var (oldValue, value) = change.GetOldAndNewValue<string>();
 
                 if (!_suspendTextChangeHandler)
                 {