diff --git a/src/Avalonia.Controls/ToolTipService.cs b/src/Avalonia.Controls/ToolTipService.cs
index 9ec9013679..d983309a72 100644
--- a/src/Avalonia.Controls/ToolTipService.cs
+++ b/src/Avalonia.Controls/ToolTipService.cs
@@ -42,11 +42,12 @@ namespace Avalonia.Controls
                 {
                     Close(control);
                 }
-                else
+                else 
                 {
-                    var tip = control.GetValue(ToolTip.ToolTipProperty);
-
-                    tip!.Content = e.NewValue;
+                    if (control.GetValue(ToolTip.ToolTipProperty) is { } tip)
+                    {
+                        tip.Content = e.NewValue;
+                    }
                 }
             }
         }