diff --git a/core/unicode/utf8/grapheme.odin b/core/unicode/utf8/grapheme.odin
index b8e51688c..d8f6557b6 100644
--- a/core/unicode/utf8/grapheme.odin
+++ b/core/unicode/utf8/grapheme.odin
@@ -107,7 +107,9 @@ decode_grapheme_clusters :: proc(
 
 	it := decode_grapheme_iterator_make(str)
 	for _, grapheme in decode_grapheme_iterate(&it) {
-		append(&graphemes, grapheme)
+		if track_graphemes {
+			append(&graphemes, grapheme)
+		}
 	}
 
 	grapheme_count = it.grapheme_count