diff --git a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
index 3a0e34bf2..5c61109ff 100644
--- a/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
+++ b/src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
@@ -45,7 +45,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Infrastructure.Autof
             {
                 var componentContext = context.Resolve<IComponentContext>();
 
-                return t => componentContext.Resolve(t);
+                return t => { object o; return componentContext.TryResolve(t, out o) ? o : null; };
             });
 
             builder.Register<MultiInstanceFactory>(context =>