diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 7a03f78..8fec1b8 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -23,6 +23,7 @@ class Configuration implements ConfigurationInterface
             ->root('nelmio_api_doc')
             ->children()
                 ->scalarNode('name')->defaultValue('API documentation')->end()
+                ->booleanNode('on_demand')->defaultTrue()->end()
                 ->arrayNode('sandbox')
                     ->addDefaultsIfNotSet()
                     ->children()
diff --git a/DependencyInjection/NelmioApiDocExtension.php b/DependencyInjection/NelmioApiDocExtension.php
index 321a2cc..cc85324 100644
--- a/DependencyInjection/NelmioApiDocExtension.php
+++ b/DependencyInjection/NelmioApiDocExtension.php
@@ -34,9 +34,12 @@ class NelmioApiDocExtension extends Extension
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('formatters.xml');
-        $loader->load('request_listener.xml');
         $loader->load('services.xml');
 
+        if ($config['on_demand']) {
+            $loader->load('request_listener.xml');
+        }
+
         if (isset($config['sandbox']['authentication'])) {
             $container->setParameter('nelmio_api_doc.sandbox.authentication', $config['sandbox']['authentication']);
         }