diff --git a/src/module-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php b/src/module-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php
index <HASH>..<HASH> 100644
--- a/src/module-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php
+++ b/src/module-elasticsuite-catalog/Block/Plugin/Adminhtml/Product/Attribute/Edit/Tab/FrontPlugin.php
@@ -99,10 +99,8 @@ class FrontPlugin
      *
      * @return Front
      */
-    public function aroundSetForm(Front $subject, \Closure $proceed, Form $form)
+    public function afterSetForm(Front $subject, Front $result, Form $form)
     {
-        $block = $proceed($form);
-
         $fieldset = $this->createFieldset($form, $subject);
 
         $this->moveOrginalFields($form);
@@ -118,7 +116,7 @@ class FrontPlugin
 
         $this->appendFieldsDependency($subject);
 
-        return $block;
+        return $result;
     }
 
     /**
REFACTOR: `around` plugins should be avoided at any price