diff --git a/src/Bundle/DependencyInjection/Compiler/RegisterFiltersPass.php b/src/Bundle/DependencyInjection/Compiler/RegisterFiltersPass.php
index 71565417..bc25a674 100644
--- a/src/Bundle/DependencyInjection/Compiler/RegisterFiltersPass.php
+++ b/src/Bundle/DependencyInjection/Compiler/RegisterFiltersPass.php
@@ -44,6 +44,10 @@ public function process(ContainerBuilder $container): void
             }
 
             foreach ($attributes as $attribute) {
+                if (isset($attribute['type'], $attribute['form_type'])) {
+                    return;
+                }
+
                 if (null === $type && null === ($attribute['type'] ?? null)) {
                     throw new InvalidArgumentException(sprintf('Tagged grid filters needs to have "type" attributes or implements "%s".', TypeAwareFilterInterface::class));
                 }
diff --git a/src/Bundle/DependencyInjection/SyliusGridExtension.php b/src/Bundle/DependencyInjection/SyliusGridExtension.php
index 493e1dab..aeeef017 100644
--- a/src/Bundle/DependencyInjection/SyliusGridExtension.php
+++ b/src/Bundle/DependencyInjection/SyliusGridExtension.php
@@ -18,7 +18,9 @@
 use Sylius\Bundle\GridBundle\SyliusGridBundle;
 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;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -60,6 +62,14 @@ public function load(array $configs, ContainerBuilder $container): void
             ->addTag('sylius.grid')
         ;
 
+        $container->registerAttributeForAutoconfiguration(AsFilter::class, static function (ChildDefinition $definition, AsFilter $attribute, \ReflectionClass $reflector) {
+            $tagAttributes = [
+                'type' => $attribute->type,
+                'form_type' => $attribute->formType,
+            ];
+            $definition->addTag('sylius.grid_filter', $tagAttributes);
+        });
+
         $container->registerForAutoconfiguration(FilterInterface::class)
             ->addTag('sylius.grid_filter')
         ;
diff --git a/src/Component/Metadata/AsFilter.php b/src/Component/Metadata/AsFilter.php
new file mode 100644
index 00000000..a7747ab0
--- /dev/null
+++ b/src/Component/Metadata/AsFilter.php
@@ -0,0 +1,24 @@
+<?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
+{
+    public function __construct(
+        public ?string $type = null,
+        public ?string $formType = null,
+    ) {
+    }
+}
diff --git a/tests/Application/config/sylius/grids/book.php b/tests/Application/config/sylius/grids/book.php
index 460521a3..4d23c095 100644
--- a/tests/Application/config/sylius/grids/book.php
+++ b/tests/Application/config/sylius/grids/book.php
@@ -13,6 +13,7 @@
 
 use App\Entity\Author;
 use App\Entity\Book;
+use App\Grid\Builder\AttributeNationalityFilter;
 use App\Grid\Builder\NationalityFilter;
 use Sylius\Bundle\GridBundle\Builder\Field\StringField;
 use Sylius\Bundle\GridBundle\Builder\Filter\EntityFilter;
@@ -31,6 +32,11 @@
             null,
             ['author.nationality'],
         ))
+        ->addFilter(AttributeNationalityFilter::create(
+            'attribute_nationality',
+            null,
+            ['author.nationality'],
+        ))
         ->addFilter(StringFilter::create(
             'currencyCode',
             ['price.currencyCode'],
diff --git a/tests/Application/src/Filter/AttributeNationalityFilter.php b/tests/Application/src/Filter/AttributeNationalityFilter.php
new file mode 100644
index 00000000..078fcdab
--- /dev/null
+++ b/tests/Application/src/Filter/AttributeNationalityFilter.php
@@ -0,0 +1,36 @@
+<?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 App\Filter;
+
+use App\Grid\Type\NationalityFilterType;
+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(
+    type: 'attribute_nationality',
+    formType: NationalityFilterType::class,
+)]
+final class AttributeNationalityFilter implements FilterInterface
+{
+    public function __construct(private EntityFilter $decorated)
+    {
+    }
+
+    public function apply(DataSourceInterface $dataSource, string $name, $data, array $options): void
+    {
+        $this->decorated->apply($dataSource, $name, $data, $options);
+    }
+}
diff --git a/tests/Application/src/Grid/Builder/AttributeNationalityFilter.php b/tests/Application/src/Grid/Builder/AttributeNationalityFilter.php
new file mode 100644
index 00000000..e247dcbb
--- /dev/null
+++ b/tests/Application/src/Grid/Builder/AttributeNationalityFilter.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 App\Grid\Builder;
+
+use App\Entity\Nationality;
+use App\Grid\Type\NationalityFilterType;
+use Sylius\Bundle\GridBundle\Builder\Filter\Filter;
+use Sylius\Bundle\GridBundle\Builder\Filter\FilterInterface;
+
+final class AttributeNationalityFilter
+{
+    public static function create(string $name, ?bool $multiple = null, ?array $fields = null): FilterInterface
+    {
+        $filter = Filter::create($name, $name);
+
+        $filter->setFormOptions(['class' => Nationality::class]);
+
+        if (null !== $fields) {
+            $filter->setOptions(['fields' => $fields]);
+        }
+
+        if (null !== $multiple) {
+            $filter->addFormOption('multiple', $multiple);
+        }
+
+        return $filter;
+    }
+}