diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs
index 87b86a8c5f..64d844a746 100644
--- a/src/umbraco.cms/businesslogic/ContentType.cs
+++ b/src/umbraco.cms/businesslogic/ContentType.cs
@@ -632,10 +632,17 @@ namespace umbraco.cms.businesslogic
                 if (value != MasterContentType)
                 {
                     //TODO: Add support for multiple masters
-                    foreach (var mct in MasterContentTypes)
+                    /*foreach (var mct in MasterContentTypes)
                     {
                         RemoveParentContentType(mct);
+                    }*/
+
+                    if (MasterContentTypes.Count > 0)
+                    {
+                        var masterId = MasterContentTypes[0];
+                        RemoveParentContentType(masterId);
                     }
+
                     AddParentContentType(value);
                 }
             }