diff --git a/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs b/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs
index 589c424629..e9370c94ce 100644
--- a/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs
+++ b/src/Umbraco.Web.Website/Routing/NotFoundSelectorPolicy.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -34,8 +34,8 @@ namespace Umbraco.Cms.Web.Website.Routing
             {
                 // return the endpoint for the RenderController.Index action.
                 ControllerActionDescriptor descriptor = x.Metadata?.GetMetadata<ControllerActionDescriptor>();
-                return descriptor.ControllerTypeInfo == typeof(RenderController)
-                    && descriptor.ActionName == nameof(RenderController.Index);
+                return descriptor?.ControllerTypeInfo == typeof(RenderController)
+                    && descriptor?.ActionName == nameof(RenderController.Index);
             });
             return e;
         }