diff --git a/src/Umbraco.Web/Editors/TemplateQuery/TemplateQueryController.cs b/src/Umbraco.Web/Editors/TemplateQuery/TemplateQueryController.cs
index 420fdf9484..6fdf18186e 100644
--- a/src/Umbraco.Web/Editors/TemplateQuery/TemplateQueryController.cs
+++ b/src/Umbraco.Web/Editors/TemplateQuery/TemplateQueryController.cs
@@ -86,11 +86,11 @@ namespace Umbraco.Web.Editors
 
                 timer.Start();
 
-                currentPage = currentPage.DescendantOrSelf(fromTypeAlias);
+                currentPage = currentPage.DescendantsOrSelf(fromTypeAlias).FirstOrDefault();
                 
                 timer.Stop();
-
-                sb.AppendFormat(".DescendantOrSelf(\"{0}\")", fromTypeAlias);
+                
+                sb.AppendFormat(".DescendantsOrSelf(\"{0}\").First()", fromTypeAlias);
             }
                 
             // TYPE to return if filtered by type