diff --git a/.changeset/css-module-class-optimization.md b/.changeset/css-module-class-optimization.md
new file mode 100644
index 00000000000..5c0a7199aa8
--- /dev/null
+++ b/.changeset/css-module-class-optimization.md
@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Optimize `class` attributes built from CSS module classes. A member access on a CSS module - a default/namespace import from a stylesheet, or a `
+
+
+
+// A `