diff --git a/Resources/config/serializer.php b/Resources/config/serializer.php
index dfb2589cb..cb7d79dfb 100644
--- a/Resources/config/serializer.php
+++ b/Resources/config/serializer.php
@@ -99,6 +99,7 @@
             ->tag('serializer.normalizer', ['priority' => -910])
 
         ->set('serializer.normalizer.json_serializable', JsonSerializableNormalizer::class)
+            ->args([null, null])
             ->tag('serializer.normalizer', ['priority' => -900])
 
         ->set('serializer.normalizer.problem', ProblemNormalizer::class)
@@ -178,6 +179,7 @@
             ->tag('serializer.encoder')
 
         ->set('serializer.encoder.yaml', YamlEncoder::class)
+            ->args([null, null])
             ->tag('serializer.encoder')
 
         ->set('serializer.encoder.csv', CsvEncoder::class)
diff --git a/Tests/Functional/app/Serializer/config.yml b/Tests/Functional/app/Serializer/config.yml
index 7878c2ecb..3721de1ca 100644
--- a/Tests/Functional/app/Serializer/config.yml
+++ b/Tests/Functional/app/Serializer/config.yml
@@ -2,7 +2,10 @@ imports:
     - { resource: ../config/default.yml }
 
 framework:
-    serializer: { enabled: true }
+    serializer:
+        enabled: true
+        default_context:
+            enable_max_depth: true
     property_info: { enabled: true }
 
 services: