diff --git a/lib/RoadizCoreBundle/src/DependencyInjection/Configuration.php b/lib/RoadizCoreBundle/src/DependencyInjection/Configuration.php
index 26510fca2..283a00f50 100644
--- a/lib/RoadizCoreBundle/src/DependencyInjection/Configuration.php
+++ b/lib/RoadizCoreBundle/src/DependencyInjection/Configuration.php
@@ -168,7 +168,7 @@ protected function addCaptchaNode()
     protected function addSolrNode()
     {
         $builder = new TreeBuilder('solr');
-        $node = $builder->getRootNode();
+        $node = $builder->getRootNode()->addDefaultsIfNotSet();
 
         $node->children()
                 ->scalarNode('timeout')->defaultValue(3)->end()
diff --git a/lib/RoadizCoreBundle/src/DependencyInjection/RoadizCoreExtension.php b/lib/RoadizCoreBundle/src/DependencyInjection/RoadizCoreExtension.php
index 4bf938d8d..99a4c7a3c 100644
--- a/lib/RoadizCoreBundle/src/DependencyInjection/RoadizCoreExtension.php
+++ b/lib/RoadizCoreBundle/src/DependencyInjection/RoadizCoreExtension.php
@@ -68,8 +68,6 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->setParameter('roadiz_core.use_accept_language_header', $config['useAcceptLanguageHeader']);
         $container->setParameter('roadiz_core.web_response_class', $config['webResponseClass']);
         $container->setParameter('roadiz_core.preview_required_role_name', $config['previewRequiredRoleName']);
-        $container->setParameter('roadiz_core.solr.search.fuzzy_proximity', $config['solr']['search']['fuzzy_proximity']);
-        $container->setParameter('roadiz_core.solr.search.fuzzy_min_term_length', $config['solr']['search']['fuzzy_min_term_length']);
 
         /*
          * Assets config
@@ -283,6 +281,10 @@ private function registerSolr(array $config, ContainerBuilder $container): void
             );
         }
         $container->setParameter('roadiz_core.solr.clients', $solrEndpoints);
+        if (isset($config['solr']['search']['fuzzy_proximity']) && isset($config['solr']['search']['fuzzy_min_term_length'])) {
+            $container->setParameter('roadiz_core.solr.search.fuzzy_proximity', $config['solr']['search']['fuzzy_proximity']);
+            $container->setParameter('roadiz_core.solr.search.fuzzy_min_term_length', $config['solr']['search']['fuzzy_min_term_length']);
+        }
     }
 
     private function registerMarkdown(array $config, ContainerBuilder $container): void