diff --git a/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
index 0ff1ec7a6d..ceabd09bb7 100644
--- a/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections;
 using System.Reactive.Linq;
+using System.Reflection;
 using Perspex.Controls;
 using Perspex.Controls.Templates;
 using Perspex.Data;
@@ -27,10 +28,12 @@ namespace Perspex.Markup.Xaml.Templates
         {
             if (DataType == null)
             {
-                throw new InvalidOperationException("DataTemplate must have a DataType.");
+                return true;
+            }
+            else
+            {
+                return DataType.GetTypeInfo().IsAssignableFrom(data.GetType().GetTypeInfo());
             }
-
-            return DataType == data.GetType();
         }
 
         public IEnumerable ItemsSelector(object item)