diff --git a/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs b/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs
index 6ae94ab57f..911ecee8e5 100644
--- a/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/ControllerExtensions.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Extensions
         /// <returns></returns>
         public static string GetControllerName(Type controllerType)
         {
-            if (!controllerType.Name.EndsWith("Controller"))
+            if (!controllerType.Name.EndsWith("Controller") && !controllerType.Name.EndsWith("Controller`1"))
             {
                 throw new InvalidOperationException("The controller type " + controllerType + " does not follow conventions, MVC Controller class names must be suffixed with the term 'Controller'");
             }