diff --git a/application/Espo/Core/InjectableFactory.php b/application/Espo/Core/InjectableFactory.php
index 135439bb78..bd92bd73ca 100644
--- a/application/Espo/Core/InjectableFactory.php
+++ b/application/Espo/Core/InjectableFactory.php
@@ -180,7 +180,11 @@ class InjectableFactory
             return $this->container->get($name);
         }
 
-        if ($dependencyClass && class_exists($dependencyClass)) {
+        if ($dependencyClass && $param->allowsNull()) {
+            return null;
+        }
+
+        if ($dependencyClass) {
             return $this->create($dependencyClass->getName());
         }