diff --git a/docs/custom_filter.md b/docs/custom_filter.md
index 850c602d..c1d85a6a 100644
--- a/docs/custom_filter.md
+++ b/docs/custom_filter.md
@@ -13,7 +13,7 @@ namespace App\Grid\Filter;
 use App\Form\Type\Filter\SuppliersStatisticsFilterType;
 use Sylius\Bundle\GridBundle\Doctrine\DataSourceInterface;
 use Sylius\Component\Grid\Filtering\FilterInterface;
-use Sylius\Component\Grid\Metadata\AsFilter;
+use Sylius\Component\Grid\Attribute\AsFilter;
 
 #[AsFilter(formType: SuppliersStatisticsFilterType::class)]
 class SuppliersStatisticsFilter implements FilterInterface
diff --git a/src/Bundle/DependencyInjection/SyliusGridExtension.php b/src/Bundle/DependencyInjection/SyliusGridExtension.php
index da797a55..49e0a70f 100644
--- a/src/Bundle/DependencyInjection/SyliusGridExtension.php
+++ b/src/Bundle/DependencyInjection/SyliusGridExtension.php
@@ -16,9 +16,9 @@
 use Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle;
 use Sylius\Bundle\GridBundle\Grid\GridInterface;
 use Sylius\Bundle\GridBundle\SyliusGridBundle;
+use Sylius\Component\Grid\Attribute\AsFilter;
 use Sylius\Component\Grid\Data\DataProviderInterface;
 use Sylius\Component\Grid\Filtering\FilterInterface;
-use Sylius\Component\Grid\Metadata\AsFilter;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -62,16 +62,20 @@ public function load(array $configs, ContainerBuilder $container): void
             ->addTag('sylius.grid')
         ;
 
-        $container->registerAttributeForAutoconfiguration(AsFilter::class, function (ChildDefinition $definition, AsFilter $attribute, \Reflector $reflector): void {
-            if (!$reflector instanceof \ReflectionClass) {
-                throw new \LogicException(sprintf('The attribute "%s" can only be used on classes.', AsFilter::class));
-            }
-            $tagAttributes = [
-                'type' => $attribute->type ?? $reflector->getName(),
-                'form_type' => $attribute->formType,
-            ];
-            $definition->addTag('sylius.grid_filter', $tagAttributes);
-        });
+        $container->registerAttributeForAutoconfiguration(
+            AsFilter::class,
+            static function (ChildDefinition $definition, AsFilter $attribute, \Reflector $reflector): void {
+                // Helps to avoid issues with psalm
+                if (!$reflector instanceof \ReflectionClass) {
+                    return;
+                }
+
+                $definition->addTag(AsFilter::SERVICE_TAG, [
+                'type' => $attribute->getType() ?? $reflector->getName(),
+                'form_type' => $attribute->getFormType(),
+                ]);
+            },
+        );
 
         $container->registerForAutoconfiguration(FilterInterface::class)
             ->addTag('sylius.grid_filter')
diff --git a/src/Component/Attribute/AsFilter.php b/src/Component/Attribute/AsFilter.php
new file mode 100644
index 00000000..8207824d
--- /dev/null
+++ b/src/Component/Attribute/AsFilter.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Sylius Sp. z o.o.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Sylius\Component\Grid\Attribute;
+
+#[\Attribute(\Attribute::TARGET_CLASS)]
+final class AsFilter
+{
+    public const SERVICE_TAG = 'sylius.grid.filter';
+
+    /**
+     * @param class-string $formType The form type class name to use for filter rendering
+     */
+    public function __construct(
+        private readonly string $formType,
+        private readonly ?string $type = null,
+    ) {
+    }
+
+    public function getFormType(): string
+    {
+        return $this->formType;
+    }
+
+    public function getType(): ?string
+    {
+        return $this->type;
+    }
+}
diff --git a/src/Component/Metadata/AsFilter.php b/src/Component/Metadata/AsFilter.php
deleted file mode 100644
index ad41d42b..00000000
--- a/src/Component/Metadata/AsFilter.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Sylius package.
- *
- * (c) Sylius Sp. z o.o.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Sylius\Component\Grid\Metadata;
-
-#[\Attribute(\Attribute::TARGET_CLASS)]
-final class AsFilter
-{
-    /**
-     * @param string $formType The form type class name to use for filter rendering
-     * @param string|null $type The filter type (defaults to FQCN of the class)
-     */
-    public function __construct(
-        public string $formType,
-        public ?string $type = null,
-    ) {
-    }
-}
diff --git a/tests/Application/src/Filter/AttributeNationalityFilter.php b/tests/Application/src/Filter/AttributeNationalityFilter.php
index 9e9e830f..678e6a64 100644
--- a/tests/Application/src/Filter/AttributeNationalityFilter.php
+++ b/tests/Application/src/Filter/AttributeNationalityFilter.php
@@ -14,10 +14,10 @@
 namespace App\Filter;
 
 use App\Grid\Type\NationalityFilterType;
+use Sylius\Component\Grid\Attribute\AsFilter;
 use Sylius\Component\Grid\Data\DataSourceInterface;
 use Sylius\Component\Grid\Filter\EntityFilter;
 use Sylius\Component\Grid\Filtering\FilterInterface;
-use Sylius\Component\Grid\Metadata\AsFilter;
 
 #[AsFilter(
     formType: NationalityFilterType::class,