From 9718324e6eb4243cf162e61db6f4915968c48b2d Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Tue, 10 Jan 2017 12:22:18 +0100
Subject: [PATCH] add check for master not being equal to template

---
 src/Umbraco.Web/Editors/TemplateController.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index 256f0df45b..58a4053de1 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -110,11 +110,16 @@ namespace Umbraco.Web.Editors
                 {
                     if (string.IsNullOrEmpty(display.MasterTemplateAlias) == false)
                     {
+
                         var master = Services.FileService.GetTemplate(display.MasterTemplateAlias);
-                        if (master != null)
-                        {
-                            template.SetMasterTemplate(master);
+                        if(master == null || master.Id == display.Id)
+                        {
+                            template.SetMasterTemplate(null);
+                        }else
+                        {
+                            template.SetMasterTemplate(master);
                         }
+
                     }
                     else
                     {