diff --git a/CHANGELOG.md b/CHANGELOG.md
index eed88973..289ca7e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,10 +10,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Wrong text displayed if module text ends with `}` ([`#2331`](https://github.com/polybar/polybar/issues/2331))
 
 ## [3.5.3] - 2020-12-23
 ### Build
-- Don't use `git` when building documentation ([`#2311`](https://github.com/polybar/polybar/issues/2309))
+- Don't use `git` when building documentation ([`#2309`](https://github.com/polybar/polybar/issues/2309))
 ### Fixed
 - Empty color values are no longer treated as invalid and no longer produce an error.
 
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index f55a05d1..86a1e983 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -646,16 +646,7 @@ bool controller::process_update(bool force) {
       block_contents += padding_right;
     }
 
-    // Strip unnecessary reset tags
-    block_contents = string_util::replace_all(block_contents, "T-}%{T", "T");
-    block_contents = string_util::replace_all(block_contents, "B-}%{B#", "B#");
-    block_contents = string_util::replace_all(block_contents, "F-}%{F#", "F#");
-    block_contents = string_util::replace_all(block_contents, "U-}%{U#", "U#");
-    block_contents = string_util::replace_all(block_contents, "u-}%{u#", "u#");
-    block_contents = string_util::replace_all(block_contents, "o-}%{o#", "o#");
-
-    // Join consecutive tags
-    contents += string_util::replace_all(block_contents, "}%{", " ");
+    contents += block_contents;
   }
 
   try {