diff --git a/common/src/app/common/flags.cljc b/common/src/app/common/flags.cljc
index c395be0e41..e570a3e67d 100644
--- a/common/src/app/common/flags.cljc
+++ b/common/src/app/common/flags.cljc
@@ -120,6 +120,7 @@
     :tiered-file-data-storage
     :token-units
     :token-typography-types
+    :token-typography-composite
     :transit-readable-response
     :user-feedback
     ;; TODO: remove this flag.
diff --git a/frontend/playwright/ui/specs/tokens.spec.js b/frontend/playwright/ui/specs/tokens.spec.js
index b86d6a379b..0ef78107d0 100644
--- a/frontend/playwright/ui/specs/tokens.spec.js
+++ b/frontend/playwright/ui/specs/tokens.spec.js
@@ -84,7 +84,10 @@ const setupTypographyTokensFile = async (page, options = {}) => {
   return setupTokensFile(page, {
     file: "workspace/get-file-typography-tokens.json",
     fileFragment: "workspace/get-file-fragment-typography-tokens.json",
-    flags: ["enable-token-typography-types"],
+    flags: [
+      "enable-token-typography-types",
+      "enable-token-typography-composite",
+    ],
     ...options,
   });
 };
diff --git a/frontend/src/app/main/ui/workspace/tokens/management.cljs b/frontend/src/app/main/ui/workspace/tokens/management.cljs
index 2ec2464359..4e141cc7bb 100644
--- a/frontend/src/app/main/ui/workspace/tokens/management.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/management.cljs
@@ -32,9 +32,11 @@
   If `:token-units` is not in cf/flags, number tokens are excluded."
   [tokens-by-type]
   (let [token-units? (contains? cf/flags :token-units)
+        token-typography-composite-types? (contains? cf/flags :token-typography-composite)
         token-typography-types? (contains? cf/flags :token-typography-types)
         all-types (cond-> dwta/token-properties
                     (not token-units?) (dissoc :number)
+                    (not token-typography-composite-types?) (remove-keys ctt/typography-token-keys)
                     (not token-typography-types?) (remove-keys ctt/ff-typography-keys))
         all-types (-> all-types keys seq)]
     (loop [empty  #js []