diff --git a/setup/feature_removal/AbstractSetupAudit.php b/setup/feature_removal/AbstractSetupAudit.php
index b7696546e..e781d99d4 100644
--- a/setup/feature_removal/AbstractSetupAudit.php
+++ b/setup/feature_removal/AbstractSetupAudit.php
@@ -8,6 +8,7 @@ use DBObjectSet;
 use IssueLog;
 use MetaModel;
 use SetupLog;
+use TagSetFieldData;
 
 require_once APPROOT.'setup/feature_removal/ModelReflectionSerializer.php';
 
@@ -68,6 +69,10 @@ abstract class AbstractSetupAudit
 				continue;
 			}
 
+			if (MetaModel::IsSameFamily($sClass, TagSetFieldData::class)) {
+				continue;
+			}
+
 			if (!MetaModel::IsStandaloneClass($sClass)) {
 				$iCount = $this->Count($sClass);
 				$this->aFinalClassesToCleanup[$sClass] = $iCount;
diff --git a/tests/php-unit-tests/unitary-tests/setup/feature_removal/SetupAuditTest.php b/tests/php-unit-tests/unitary-tests/setup/feature_removal/SetupAuditTest.php
index 383d9a398..eff5c4589 100644
--- a/tests/php-unit-tests/unitary-tests/setup/feature_removal/SetupAuditTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/feature_removal/SetupAuditTest.php
@@ -79,6 +79,7 @@ class SetupAuditTest extends ItopCustomDatamodelTestCase
 			"Feature1Module1MyClass",
 			"FinalClassFeature2Module1MyClass",
 			"FinalClassFeature2Module1MyFinalClassFromLocation",
+			"TagSetFieldDataFor_FinalClassFeature2Module1MyFinalClassFromLocation__domains",
 		];
 		$this->assertEqualsCanonicalizing($expected, $oSetupAudit->GetRemovedClasses());
 
diff --git a/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext1/finalclass_ext1_module1/datamodel.finalclass_ext1_module1.xml b/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext1/finalclass_ext1_module1/datamodel.finalclass_ext1_module1.xml
index 9b3461416..c08057a64 100644
--- a/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext1/finalclass_ext1_module1/datamodel.finalclass_ext1_module1.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext1/finalclass_ext1_module1/datamodel.finalclass_ext1_module1.xml
@@ -64,6 +64,12 @@
           <is_null_allowed>false</is_null_allowed>
           <validation_pattern/>
         </field>
+        <field id="domains" xsi:type="AttributeTagSet">
+          <sql>domains</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <tracking_level>all</tracking_level>
+          <max_items>12</max_items>
+        </field>
       </fields>
       <methods/>
       <presentation/>
diff --git a/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext2/finalclass_ext2_module1/datamodel.finalclass_ext2_module1.xml b/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext2/finalclass_ext2_module1/datamodel.finalclass_ext2_module1.xml
index 0fd50aac7..f36d88b2c 100644
--- a/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext2/finalclass_ext2_module1/datamodel.finalclass_ext2_module1.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/feature_removal/additional_features/finalclass_ext2/finalclass_ext2_module1/datamodel.finalclass_ext2_module1.xml
@@ -31,6 +31,12 @@
           <default_value/>
           <is_null_allowed>false</is_null_allowed>
         </field>
+        <field id="domains" xsi:type="AttributeTagSet">
+          <sql>domains</sql>
+          <is_null_allowed>true</is_null_allowed>
+          <tracking_level>all</tracking_level>
+          <max_items>12</max_items>
+        </field>
       </fields>
       <methods/>
       <presentation/>