diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlRecordReader.cs b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlRecordReader.cs index 46d99d545a4..85b021dd3d5 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlRecordReader.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Markup/BamlRecordReader.cs @@ -5680,7 +5680,15 @@ internal StaticResourceHolder(object resourceKey, DeferredResourceReference pref internal override DeferredResourceReference PrefetchedValue { - get { return _prefetchedValue; } + get + { + if (_prefetchedValue == null || _prefetchedValue.Value == DependencyProperty.UnsetValue) + { + return null; + } + + return _prefetchedValue; + } } #endregion Methods