diff --git a/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs b/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs
index f5dd4b5f4b..1f5d259fc3 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Context/AvaloniaObjectAssembler.cs
@@ -23,6 +23,7 @@ namespace Avalonia.Markup.Xaml.Context
             Settings settings = null)
         {
             var mapping = new DeferredLoaderMapping();
+            mapping.Map<Template>(x => x.Content, new TemplateLoader());
             mapping.Map<ControlTemplate>(x => x.Content, new TemplateLoader());
             mapping.Map<DataTemplate>(x => x.Content, new TemplateLoader());
             mapping.Map<FocusAdornerTemplate>(x => x.Content, new TemplateLoader());