diff --git a/core/core.services.yml b/core/core.services.yml
index d8a4a5b94e..6b972c88d4 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -743,7 +743,7 @@ services:
     class: Drupal\Core\StackMiddleware\StackedHttpKernel
   http_kernel.basic:
     class: Symfony\Component\HttpKernel\HttpKernel
-    arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack', '@http_kernel.controller.argument_resolver', false]
+    arguments: ['@event_dispatcher', '@controller_resolver', '@request_stack', '@http_kernel.controller.argument_resolver', true]
   http_kernel.controller.argument_resolver:
     class: Symfony\Component\HttpKernel\Controller\ArgumentResolver
     arguments: ['@http_kernel.controller.argument_metadata_factory', ['@argument_resolver.request_attribute', '@argument_resolver.request', '@argument_resolver.psr7_request', '@argument_resolver.route_match', '@argument_resolver.default']]
diff --git a/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php b/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
index 2d08efc6fc..bbc6f28a02 100644
--- a/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
+++ b/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
@@ -63,6 +63,10 @@ public function handle(Request $request, $type = self::MAIN_REQUEST, $catch = TR
       throw new \Exception('Oh oh, bananas in the instruments.');
     }
 
+    if (\Drupal::state()->get('error_service_test.get_broken_service')) {
+      \Drupal::service('broken_class_with_missing_dependency');
+    }
+
     if (\Drupal::state()->get('error_service_test.break_logger')) {
       throw new \Exception('Deforestation');
     }
diff --git a/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php b/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
index b03e000b48..1cd55ec6c0 100644
--- a/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
+++ b/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
@@ -159,6 +159,8 @@ public function testMissingDependencyCustomErrorHandler() {
     $settings_php .= "\$settings['teapots'] = TRUE;\n";
     file_put_contents($settings_filename, $settings_php);
 
+    \Drupal::state()->set('error_service_test.get_broken_service', TRUE);
+
     $this->drupalGet('broken-service-class');
     $this->assertSession()->statusCodeEquals(418);
     $this->assertSession()->responseContains('Oh oh, flying teapots');