diff --git a/composer.json b/composer.json
index cb6b8d3..cf13c15 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
     "ext-dom": "*",
     "azjezz/psl": "^2.9.1 || ^3.0.0 || ^4.0.0",
-    "easycorp/easyadmin-bundle": "~4.27.5",
+    "easycorp/easyadmin-bundle": "~4.27.7",
     "symfony/asset": "^6.4 || ^7.4",
     "symfony/cache": "^6.4 || ^7.4",
     "symfony/config": "^6.4 || ^7.4",
diff --git a/psalm.baseline.xml b/psalm.baseline.xml
index 0433461..c340f37 100644
--- a/psalm.baseline.xml
+++ b/psalm.baseline.xml
@@ -4,19 +4,24 @@
     <ArgumentTypeCoercion>
       <code><![CDATA[$apply]]></code>
     </ArgumentTypeCoercion>
+    <InvalidReturnStatement>
+      <code><![CDATA[$currentAdminContext]]></code>
+    </InvalidReturnStatement>
+    <InvalidReturnType>
+      <code><![CDATA[AdminContext<TEntity>]]></code>
+    </InvalidReturnType>
     <MixedArgument>
       <code><![CDATA[$pageActions]]></code>
     </MixedArgument>
   </file>
   <file src="src/Controller/BaseCrudDtoController.php">
     <InvalidArgument>
-      <code><![CDATA[$context->getEntity()]]></code>
-      <code><![CDATA[$context->getEntity()]]></code>
-      <code><![CDATA[$context->getEntity()]]></code>
+      <code><![CDATA[$dto]]></code>
       <code><![CDATA[$entityInstance]]></code>
       <code><![CDATA[$entityInstance]]></code>
       <code><![CDATA[$entityInstance]]></code>
       <code><![CDATA[$entityInstance]]></code>
+      <code><![CDATA[$this->createDto()]]></code>
     </InvalidArgument>
     <MixedArgument>
       <code><![CDATA[$this->container->get('doctrine')->getManagerForClass($context->getEntity()->getFqcn())]]></code>
@@ -41,6 +46,8 @@
       <code><![CDATA[$context->getRequest()->query->get('newValue')]]></code>
       <code><![CDATA[$entityInstance]]></code>
       <code><![CDATA[$entityInstance]]></code>
+      <code><![CDATA[$entityInstance]]></code>
+      <code><![CDATA[$entityInstance]]></code>
     </PossiblyNullArgument>
     <PossiblyNullReference>
       <code><![CDATA[getActionsConfig]]></code>
diff --git a/src/Controller/BaseCrudController.php b/src/Controller/BaseCrudController.php
index 20f8e26..3ebc279 100644
--- a/src/Controller/BaseCrudController.php
+++ b/src/Controller/BaseCrudController.php
@@ -115,6 +115,9 @@ protected function addConfirmationForAction(
         return $action;
     }
 
+    /**
+     * @return AdminContext<TEntity>
+     */
     protected function currentAdminContext(): AdminContext
     {
         $currentAdminContext = $this->getContext();