diff --git a/src/Avalonia.Base/Controls/NameScopeExtensions.cs b/src/Avalonia.Base/Controls/NameScopeExtensions.cs
index 7d80d2fde7..0abd5e56f7 100644
--- a/src/Avalonia.Base/Controls/NameScopeExtensions.cs
+++ b/src/Avalonia.Base/Controls/NameScopeExtensions.cs
@@ -27,7 +27,7 @@ namespace Avalonia.Controls
 
             if (result == null)
             {
-                return (T?)result;
+                return null;
             }
 
             if (result is T typed)