diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 122e6f86..6ffeae35 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -116,6 +116,8 @@ public function getConfigTreeBuilder()
             ->children();
         $listenerPriorities->scalarNode('request')
             ->defaultValue(1);
+        $listenerPriorities->scalarNode('sub_request')
+            ->defaultValue(1);
         $listenerPriorities->scalarNode('console')
             ->defaultValue(1);
 
diff --git a/src/EventListener/SubRequestListener.php b/src/EventListener/SubRequestListener.php
new file mode 100644
index 00000000..80c473c8
--- /dev/null
+++ b/src/EventListener/SubRequestListener.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Sentry\SentryBundle\EventListener;
+
+use Sentry\State\Hub;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+
+final class SubRequestListener
+{
+    /**
+     * Pushes a new {@see Scope} for each SubRequest
+     *
+     * @param GetResponseEvent $event
+     */
+    public function onKernelRequest(GetResponseEvent $event): void
+    {
+        if ($event->isMasterRequest()) {
+            return;
+        }
+
+        Hub::getCurrent()->pushScope();
+    }
+
+    /**
+     * Pops a {@see Scope} for each finished SubRequest
+     *
+     * @param FinishRequestEvent $event
+     */
+    public function onKernelFinishRequest(FinishRequestEvent $event): void
+    {
+        if ($event->isMasterRequest()) {
+            return;
+        }
+
+        Hub::getCurrent()->popScope();
+    }
+}
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
index ab43c4a7..cb55102e 100644
--- a/src/Resources/config/services.xml
+++ b/src/Resources/config/services.xml
@@ -38,5 +38,10 @@
             <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="%sentry.listener_priorities.request%" />
             <tag name="kernel.event_listener" event="kernel.controller" method="onKernelController" priority="%sentry.listener_priorities.request%" />
         </service>
+
+        <service id="Sentry\SentryBundle\EventListener\SubRequestListener" class="Sentry\SentryBundle\EventListener\SubRequestListener" public="false">
+            <tag name="kernel.event_listener" event="kernel.request" method="onKernelRequest" priority="%sentry.listener_priorities.sub_request%" />
+            <tag name="kernel.event_listener" event="kernel.finish_request" method="onKernelFinishRequest" priority="%sentry.listener_priorities.sub_request%" />
+        </service>
     </services>
 </container>
diff --git a/test/DependencyInjection/ConfigurationTest.php b/test/DependencyInjection/ConfigurationTest.php
index 6dd3a367..b937830b 100644
--- a/test/DependencyInjection/ConfigurationTest.php
+++ b/test/DependencyInjection/ConfigurationTest.php
@@ -52,6 +52,7 @@ public function testConfigurationDefaults(): void
             'dsn' => null,
             'listener_priorities' => [
                 'request' => 1,
+                'sub_request' => 1,
                 'console' => 1,
             ],
             'options' => [
diff --git a/test/DependencyInjection/SentryExtensionTest.php b/test/DependencyInjection/SentryExtensionTest.php
index bf259980..26d0bd42 100644
--- a/test/DependencyInjection/SentryExtensionTest.php
+++ b/test/DependencyInjection/SentryExtensionTest.php
@@ -9,8 +9,6 @@
 use Sentry\Integration\IntegrationInterface;
 use Sentry\Options;
 use Sentry\SentryBundle\DependencyInjection\SentryExtension;
-use Sentry\SentryBundle\EventListener\ConsoleListener;
-use Sentry\SentryBundle\EventListener\RequestListener;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -21,8 +19,6 @@
 
 class SentryExtensionTest extends TestCase
 {
-    private const REQUEST_LISTENER_TEST_PUBLIC_ALIAS = 'sentry.request_listener.public_alias';
-    private const CONSOLE_LISTENER_TEST_PUBLIC_ALIAS = 'sentry.console_listener.public_alias';
     private const OPTIONS_TEST_PUBLIC_ALIAS = 'sentry.options.public_alias';
 
     public function testDataProviderIsMappingTheRightNumberOfOptions(): void
@@ -62,9 +58,25 @@ public function testOptionsDefaultValues(): void
         $this->assertSame(['var/cache', $vendorDir], $options->getInAppExcludedPaths());
 
         $this->assertSame(1, $container->getParameter('sentry.listener_priorities.request'));
+        $this->assertSame(1, $container->getParameter('sentry.listener_priorities.sub_request'));
         $this->assertSame(1, $container->getParameter('sentry.listener_priorities.console'));
     }
 
+    public function testListenerPriorities(): void
+    {
+        $container = $this->getContainer([
+            'listener_priorities' => [
+                'request' => 123,
+                'sub_request' => 456,
+                'console' => 789,
+            ],
+        ]);
+
+        $this->assertSame(123, $container->getParameter('sentry.listener_priorities.request'));
+        $this->assertSame(456, $container->getParameter('sentry.listener_priorities.sub_request'));
+        $this->assertSame(789, $container->getParameter('sentry.listener_priorities.console'));
+    }
+
     /**
      * @dataProvider optionsValueProvider
      */
@@ -326,8 +338,6 @@ private function getContainer(array $configuration = []): Container
         $containerBuilder->set('request_stack', $mockRequestStack);
         $containerBuilder->set('event_dispatcher', $mockEventDispatcher);
         $containerBuilder->setAlias(self::OPTIONS_TEST_PUBLIC_ALIAS, new Alias(Options::class, true));
-        $containerBuilder->setAlias(self::REQUEST_LISTENER_TEST_PUBLIC_ALIAS, new Alias(RequestListener::class, true));
-        $containerBuilder->setAlias(self::CONSOLE_LISTENER_TEST_PUBLIC_ALIAS, new Alias(ConsoleListener::class, true));
 
         $beforeSend = new Definition('callable');
         $beforeSend->setFactory([CallbackMock::class, 'createCallback']);
diff --git a/test/EventListener/SubRequestListenerTest.php b/test/EventListener/SubRequestListenerTest.php
new file mode 100644
index 00000000..cb4db719
--- /dev/null
+++ b/test/EventListener/SubRequestListenerTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace Sentry\SentryBundle\Test\EventListener;
+
+use PHPUnit\Framework\TestCase;
+use Sentry\SentryBundle\EventListener\SubRequestListener;
+use Sentry\State\Hub;
+use Sentry\State\HubInterface;
+use Sentry\State\Scope;
+use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
+
+class SubRequestListenerTest extends TestCase
+{
+    private $currentHub;
+
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->currentHub = $this->prophesize(HubInterface::class);
+
+        Hub::setCurrent($this->currentHub->reveal());
+    }
+
+    public function testOnKernelRequestWithMasterRequest(): void
+    {
+        $listener = new SubRequestListener();
+
+        $subRequestEvent = $this->prophesize(GetResponseEvent::class);
+        $subRequestEvent->isMasterRequest()
+            ->willReturn(true);
+
+        $this->currentHub->pushScope()
+            ->shouldNotBeCalled();
+
+        $listener->onKernelRequest($subRequestEvent->reveal());
+    }
+
+    public function testOnKernelRequestWithSubRequest(): void
+    {
+        $listener = new SubRequestListener();
+
+        $subRequestEvent = $this->prophesize(GetResponseEvent::class);
+        $subRequestEvent->isMasterRequest()
+            ->willReturn(false);
+
+        $this->currentHub->pushScope()
+            ->shouldBeCalledTimes(1)
+            ->willReturn(new Scope());
+
+        $listener->onKernelRequest($subRequestEvent->reveal());
+    }
+
+    public function testOnKernelFinishRequestWithMasterRequest(): void
+    {
+        $listener = new SubRequestListener();
+
+        $subRequestEvent = $this->prophesize(FinishRequestEvent::class);
+        $subRequestEvent->isMasterRequest()
+            ->willReturn(true);
+
+        $this->currentHub->popScope()
+            ->shouldNotBeCalled();
+
+        $listener->onKernelFinishRequest($subRequestEvent->reveal());
+    }
+
+    public function testOnKernelFinishRequestWithSubRequest(): void
+    {
+        $listener = new SubRequestListener();
+
+        $subRequestEvent = $this->prophesize(FinishRequestEvent::class);
+        $subRequestEvent->isMasterRequest()
+            ->willReturn(false);
+
+        $this->currentHub->popScope()
+            ->shouldBeCalledTimes(1)
+            ->willReturn(true);
+
+        $listener->onKernelFinishRequest($subRequestEvent->reveal());
+    }
+}
diff --git a/test/SentryBundleTest.php b/test/SentryBundleTest.php
index 221d28c2..e94c4166 100644
--- a/test/SentryBundleTest.php
+++ b/test/SentryBundleTest.php
@@ -6,9 +6,12 @@
 use Sentry\SentryBundle\DependencyInjection\SentryExtension;
 use Sentry\SentryBundle\EventListener\ConsoleListener;
 use Sentry\SentryBundle\EventListener\RequestListener;
+use Sentry\SentryBundle\EventListener\SubRequestListener;
+use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 class SentryBundleTest extends TestCase
 {
@@ -21,7 +24,7 @@ public function testContainerHasConsoleListenerConfiguredCorrectly(): void
         $expectedTag = [
             'kernel.event_listener' => [
                 [
-                    'event' => 'console.command',
+                    'event' => ConsoleEvents::COMMAND,
                     'method' => 'onConsoleCommand',
                     'priority' => '%sentry.listener_priorities.console%',
                 ],
@@ -40,12 +43,12 @@ public function testContainerHasRequestListenerConfiguredCorrectly(): void
         $expectedTag = [
             'kernel.event_listener' => [
                 [
-                    'event' => 'kernel.request',
+                    'event' => KernelEvents::REQUEST,
                     'method' => 'onKernelRequest',
                     'priority' => '%sentry.listener_priorities.request%',
                 ],
                 [
-                    'event' => 'kernel.controller',
+                    'event' => KernelEvents::CONTROLLER,
                     'method' => 'onKernelController',
                     'priority' => '%sentry.listener_priorities.request%',
                 ],
@@ -55,6 +58,30 @@ public function testContainerHasRequestListenerConfiguredCorrectly(): void
         $this->assertSame($expectedTag, $consoleListener->getTags());
     }
 
+    public function testContainerHasSubRequestListenerConfiguredCorrectly(): void
+    {
+        $container = $this->getContainer();
+
+        $consoleListener = $container->getDefinition(SubRequestListener::class);
+
+        $expectedTag = [
+            'kernel.event_listener' => [
+                [
+                    'event' => KernelEvents::REQUEST,
+                    'method' => 'onKernelRequest',
+                    'priority' => '%sentry.listener_priorities.sub_request%',
+                ],
+                [
+                    'event' => KernelEvents::FINISH_REQUEST,
+                    'method' => 'onKernelFinishRequest',
+                    'priority' => '%sentry.listener_priorities.sub_request%',
+                ],
+            ],
+        ];
+
+        $this->assertSame($expectedTag, $consoleListener->getTags());
+    }
+
     private function getContainer(array $configuration = []): ContainerBuilder
     {
         $containerBuilder = new ContainerBuilder();