diff --git a/CRUD/Controller/CRUDController.php b/CRUD/Controller/CRUDController.php
index c9047783b..e9dfc3845 100644
--- a/CRUD/Controller/CRUDController.php
+++ b/CRUD/Controller/CRUDController.php
@@ -225,9 +225,9 @@ class CRUDController extends AbstractController
      * @param QueryBuilder|mixed $query by default, an instance of QueryBuilder
      * @param Request $request
      * @param PaginatorInterface $paginator
-     * @return QueryBuilder
+     * @return QueryBuilder|mixed
      */
-    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator): QueryBuilder
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
         return $query;
     }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index de22136a3..04a1fb87a 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -121,7 +121,10 @@ class Configuration implements ConfigurationInterface
                     ->arrayPrototype()
                         ->children()
                             ->scalarNode('class')->cannotBeEmpty()->isRequired()->end()
-                            ->scalarNode('controller')->cannotBeEmpty()->isRequired()->end()
+                            ->scalarNode('controller')
+                                ->cannotBeEmpty()
+                                ->defaultValue(\Chill\MainBundle\CRUD\Controller\CRUDController::class)
+                            ->end()
                             ->scalarNode('name')->cannotBeEmpty()->isRequired()->end()
                             ->scalarNode('base_path')->cannotBeEmpty()->isRequired()->end()
                             ->scalarNode('base_role')->defaultNull()->end()