diff --git a/src/Umbraco.Web/Mvc/RenderViewEngine.cs b/src/Umbraco.Web/Mvc/RenderViewEngine.cs
index 89906980b9..960ff1bb71 100644
--- a/src/Umbraco.Web/Mvc/RenderViewEngine.cs
+++ b/src/Umbraco.Web/Mvc/RenderViewEngine.cs
@@ -94,19 +94,17 @@ namespace Umbraco.Web.Mvc
 		/// <returns></returns>
         private bool ShouldFindView(ControllerContext controllerContext, bool isPartial)
         {
+            var umbracoToken = controllerContext.GetDataTokenInViewContextHierarchy("umbraco");
+
             //first check if we're rendering a partial view for the back office, or surface controller, etc...
             //anything that is not IUmbracoRenderModel as this should only pertain to Umbraco views.
-            if (isPartial
-                && controllerContext.RouteData.DataTokens.ContainsKey("umbraco")
-                && !(controllerContext.RouteData.DataTokens["umbraco"] is RenderModel))
+            if (isPartial && ((umbracoToken is RenderModel) == false))
             {
                 return true;
             }
 
             //only find views if we're rendering the umbraco front end
-            if (controllerContext.RouteData.DataTokens.ContainsKey("umbraco")
-                && controllerContext.RouteData.DataTokens["umbraco"] != null
-                && controllerContext.RouteData.DataTokens["umbraco"] is RenderModel)
+            if (umbracoToken is RenderModel)
             {
                 return true;
             }