diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php
index ae94d043eaf4..57623f1d727b 100644
--- a/CRM/Core/BAO/Tag.php
+++ b/CRM/Core/BAO/Tag.php
@@ -453,6 +453,8 @@ public static function add(&$params, $ids = []) {
       );
     }
 
+    CRM_Core_PseudoConstant::flush();
+
     return $tag;
   }
 
diff --git a/CRM/Core/DAO/Tag.php b/CRM/Core/DAO/Tag.php
index f1578b26249d..397ebf2a4adb 100644
--- a/CRM/Core/DAO/Tag.php
+++ b/CRM/Core/DAO/Tag.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Tag.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:7267e5b21f5bc822a58ffffc23b6dec1)
+ * (GenCodeChecksum:18f8021635fed59be1eabc246f6b88cb)
  */
 
 /**
@@ -182,6 +182,11 @@ public static function &fields() {
           'bao' => 'CRM_Core_BAO_Tag',
           'localizable' => 0,
           'FKClassName' => 'CRM_Core_DAO_Tag',
+          'pseudoconstant' => [
+            'table' => 'civicrm_tag',
+            'keyColumn' => 'id',
+            'labelColumn' => 'name',
+          ],
         ],
         'is_selectable' => [
           'name' => 'is_selectable',
diff --git a/xml/schema/Core/Tag.xml b/xml/schema/Core/Tag.xml
index 378845845169..db74bb8e0196 100644
--- a/xml/schema/Core/Tag.xml
+++ b/xml/schema/Core/Tag.xml
@@ -42,6 +42,11 @@
     <type>int unsigned</type>
     <default>NULL</default>
     <comment>Optional parent id for this tag.</comment>
+    <pseudoconstant>
+      <table>civicrm_tag</table>
+      <keyColumn>id</keyColumn>
+      <labelColumn>name</labelColumn>
+    </pseudoconstant>
     <add>1.1</add>
   </field>
   <field>