diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a2048f83..aa1a50fdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 * Fix: Deprecated dependency `Specflow.Internal.Json` is used. Relpaced with `System.Text.Json`. The dependency was used for laoding `reqnroll.json`, for Visual Studio integration and for telemetry. (#373)
 * Fix: Error with NUnit 4: "Only static OneTimeSetUp and OneTimeTearDown are allowed for InstancePerTestCase mode" (#379)
 * Fix: Reqnroll.Autofac: FeatureContext cannot be resolved in BeforeFeature/AfterFeature hooks (#340)
+* Fix: Attempting to set the `ConcurrentObjectResolutionTimeout` value on the `ObjectContainer` to `TimeSpan.Zero` sometimes throws an exception if running multiple tests in parallel. (#440)
 
 *Contributors of this release (in alphabetical order):* @Antwane, @clrudolphi, @gasparnagy, @obligaron, @olegKoshmeliuk, @SeanKilleen, @StefH
 
diff --git a/Reqnroll/BoDi/ObjectContainer.cs b/Reqnroll/BoDi/ObjectContainer.cs
index 0c14c96fa..6b071bdd5 100644
--- a/Reqnroll/BoDi/ObjectContainer.cs
+++ b/Reqnroll/BoDi/ObjectContainer.cs
@@ -238,7 +238,17 @@ protected static object ExecuteWithLock(object lockObject, Func<object> getter,
                 return obj;
 
             if (timeout == TimeSpan.Zero)
-                return factory();
+            {
+                Monitor.Enter(lockObject);
+                try
+                {
+                    return factory();
+                }
+                finally
+                {
+                    Monitor.Exit(lockObject);
+                }
+            }
 
             if (Monitor.TryEnter(lockObject, timeout))
             {