diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
index d450e49389..109653b665 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
@@ -53,6 +53,13 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
             return;
         }
 
+        $taggedSubscribers = $container->findTaggedServiceIds($this->tagPrefix.'.event_subscriber');
+        $taggedListeners = $container->findTaggedServiceIds($this->tagPrefix.'.event_listener');
+
+        if (empty($taggedSubscribers) && empty($taggedListeners)) {
+            return;
+        }
+
         $this->container = $container;
         $this->connections = $container->getParameter($this->connections);
         $sortFunc = function($a, $b) {
@@ -62,26 +69,31 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
             return $a > $b ? -1 : 1;
         };
 
-        $subscribersPerCon = $this->groupByConnection($container->findTaggedServiceIds($this->tagPrefix.'.event_subscriber'));
-        foreach ($subscribersPerCon as $con => $subscribers) {
-            $em = $this->getEventManager($con);
 
-            uasort($subscribers, $sortFunc);
-            foreach ($subscribers as $id => $instance) {
-                $em->addMethodCall('addEventSubscriber', array(new Reference($id)));
+        if (!empty($taggedSubscribers)) {
+            $subscribersPerCon = $this->groupByConnection($taggedSubscribers);
+            foreach ($subscribersPerCon as $con => $subscribers) {
+                $em = $this->getEventManager($con);
+
+                uasort($subscribers, $sortFunc);
+                foreach ($subscribers as $id => $instance) {
+                    $em->addMethodCall('addEventSubscriber', array(new Reference($id)));
+                }
             }
         }
 
-        $listenersPerCon = $this->groupByConnection($container->findTaggedServiceIds($this->tagPrefix.'.event_listener'), true);
-        foreach ($listenersPerCon as $con => $listeners) {
-            $em = $this->getEventManager($con);
+        if (!empty($taggedListeners)) {
+            $listenersPerCon = $this->groupByConnection($taggedListeners, true);
+            foreach ($listenersPerCon as $con => $listeners) {
+                $em = $this->getEventManager($con);
 
-            uasort($listeners, $sortFunc);
-            foreach ($listeners as $id => $instance) {
-                $em->addMethodCall('addEventListener', array(
-                    array_unique($instance['event']),
-                    isset($instance['lazy']) && $instance['lazy'] ? $id : new Reference($id),
-                ));
+                uasort($listeners, $sortFunc);
+                foreach ($listeners as $id => $instance) {
+                    $em->addMethodCall('addEventListener', array(
+                        array_unique($instance['event']),
+                        isset($instance['lazy']) && $instance['lazy'] ? $id : new Reference($id),
+                    ));
+                }
             }
         }
     }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
index e679aaf7ec..9de67ce867 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php
@@ -109,6 +109,17 @@ class RegisterEventListenersAndSubscribersPassTest extends \PHPUnit_Framework_Te
         $this->assertEquals(array('c', 'd', 'e', 'b', 'a'), $this->getServiceOrder($container, 'addEventSubscriber'));
     }
 
+    public function testProcessNoTaggedServices()
+    {
+        $container = $this->createBuilder(true);
+
+        $this->process($container);
+
+        $this->assertEquals(array(), $container->getDefinition('doctrine.dbal.default_connection.event_manager')->getMethodCalls());
+
+        $this->assertEquals(array(), $container->getDefinition('doctrine.dbal.second_connection.event_manager')->getMethodCalls());
+    }
+
     private function process(ContainerBuilder $container)
     {
         $pass = new RegisterEventListenersAndSubscribersPass('doctrine.connections', 'doctrine.dbal.%s_connection.event_manager', 'doctrine');