diff --git a/src/Orchard.Tests/Mvc/OrchardControllerFactoryTests.cs b/src/Orchard.Tests/Mvc/OrchardControllerFactoryTests.cs
index 45c500a22..360e4d8f8 100644
--- a/src/Orchard.Tests/Mvc/OrchardControllerFactoryTests.cs
+++ b/src/Orchard.Tests/Mvc/OrchardControllerFactoryTests.cs
@@ -59,6 +59,7 @@ namespace Orchard.Tests.Mvc {
         }
 
         [Test]
+        [Ignore("OrchardControllerFactory depends on metadata, calling base when no context is causing errors.")]
         public void WhenNullOrMissingContainerNormalControllerFactoryRulesShouldBeUsedAsFallback() {
             var requestContext = GetRequestContext(null);
             var controller = _controllerFactory.CreateController(requestContext, "foo");
diff --git a/src/Orchard/Mvc/OrchardControllerFactory.cs b/src/Orchard/Mvc/OrchardControllerFactory.cs
index 4f5510299..929cdf5fb 100644
--- a/src/Orchard/Mvc/OrchardControllerFactory.cs
+++ b/src/Orchard/Mvc/OrchardControllerFactory.cs
@@ -42,7 +42,7 @@ namespace Orchard.Mvc {
                 return info.Metadata.ControllerType;
             }
 
-            return workContext == null ? base.GetControllerType(requestContext, controllerName) : null;
+            return null;
         }
 
         protected override IController GetControllerInstance(RequestContext requestContext, System.Type controllerType) {
@@ -52,7 +52,7 @@ namespace Orchard.Mvc {
                 return controller;
             }
 
-            return workContext == null ? base.GetControllerInstance(requestContext, controllerType) : null;
+            return null;
         }
 
         public static string GetAreaName(RouteBase route) {