diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs index 38c04505e6..acf1dc1143 100644 --- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs +++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs @@ -36,9 +36,9 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions { AvaloniaProperty ap => ap, PropertyInfo pi => new Avalonia.Data.Core.ReflectionClrPropertyInfo(pi), - _ => provideTarget.TargetProperty, - } - ; + _ => provideTarget?.TargetProperty, + }; + var themeVariant = (targetObject as IThemeVariantHost)?.ActualThemeVariant ?? GetDictionaryVariant(serviceProvider);