diff --git a/src/DependencyInjection/BehatApiContextExtension.php b/src/DependencyInjection/BehatApiContextExtension.php
index 717610b..6c8a887 100644
--- a/src/DependencyInjection/BehatApiContextExtension.php
+++ b/src/DependencyInjection/BehatApiContextExtension.php
@@ -50,7 +50,7 @@ private function loadApiContext(
 
                 $apiContextDefinition->addMethodCall(
                     'addKernelResetManager',
-                    [$resetManagerDefinition]
+                    [$resetManagerDefinition],
                 );
             }
         }
@@ -60,18 +60,10 @@ private function enableOrmContext(array $config, ContainerBuilder $container): v
     {
         $config['use_orm_context'] = $config['use_orm_context'] ?? true;
 
-        if (!$config['use_orm_context']) {
+        if ($config['use_orm_context']) {
             return;
         }
 
-        if (!$container->has(EntityManagerInterface::class)) {
-            throw new RuntimeException('Entity manager does not exists');
-        }
-
-        $entityManagerDef = $container->get(EntityManagerInterface::class);
-
-        $ormContextDef = new Definition(ORMContext::class);
-        $ormContextDef->setArgument('$manager', $entityManagerDef);
-        $container->setDefinition(ORMContext::class, $ormContextDef);
+        $container->removeDefinition(ORMContext::class);
     }
 }
diff --git a/src/Resources/config/api_context.xml b/src/Resources/config/api_context.xml
index c86c7da..9689b34 100644
--- a/src/Resources/config/api_context.xml
+++ b/src/Resources/config/api_context.xml
@@ -5,6 +5,7 @@
 
     <services>
         <service public="true" autowire="true" id="BehatApiContext\Context\ApiContext" class="BehatApiContext\Context\ApiContext"/>
+        <service public="true" autowire="true" id="BehatApiContext\Context\ORMContext" class="BehatApiContext\Context\ORMContext"/>
 
         <service public="false" id="BehatApiContext\Service\ResetManager\DoctrineResetManager" class="BehatApiContext\Service\ResetManager\DoctrineResetManager"/>
     </services>