diff --git a/src/Umbraco.Web/Mvc/EnsurePartialViewMacroViewContextFilterAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePartialViewMacroViewContextFilterAttribute.cs
index 5be98f338b..625b67b2b2 100644
--- a/src/Umbraco.Web/Mvc/EnsurePartialViewMacroViewContextFilterAttribute.cs
+++ b/src/Umbraco.Web/Mvc/EnsurePartialViewMacroViewContextFilterAttribute.cs
@@ -30,7 +30,7 @@ namespace Umbraco.Web.Mvc
         public override void OnActionExecuting(ActionExecutingContext filterContext)
         {
             //ignore anything that is not IRenderController
-            if ((filterContext.Controller is IRenderController) == false)
+            if ((filterContext.Controller is IRenderController) == false && filterContext.IsChildAction == false)
                 return;
 
             SetViewContext(filterContext);
@@ -45,7 +45,7 @@ namespace Umbraco.Web.Mvc
         public override void OnResultExecuting(ResultExecutingContext filterContext)
         {
             //ignore anything that is not IRenderController
-            if ((filterContext.Controller is IRenderController) == false)
+            if ((filterContext.Controller is IRenderController) == false && filterContext.IsChildAction == false)
                 return;
 
             SetViewContext(filterContext);