diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53b72a20..e86fcb45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -93,11 +93,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Parser error if click command contained `}`
   ([`#2040`](https://github.com/polybar/polybar/issues/2040))
 
+## [3.5.4] - 2021-01-07
+### 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.
 
-[Unreleased]: https://github.com/polybar/polybar/compare/3.5.3...HEAD
+[Unreleased]: https://github.com/polybar/polybar/compare/3.5.4...HEAD
+[3.5.4]: https://github.com/polybar/polybar/releases/tag/3.5.4
 [3.5.3]: https://github.com/polybar/polybar/releases/tag/3.5.3
diff --git a/src/components/controller.cpp b/src/components/controller.cpp
index 32455912..0a7b803f 100644
--- a/src/components/controller.cpp
+++ b/src/components/controller.cpp
@@ -664,16 +664,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 {
diff --git a/version.txt b/version.txt
index af8cdbfd..094129b6 100644
--- a/version.txt
+++ b/version.txt
@@ -1,4 +1,4 @@
 # Polybar version information
 # Update this on every release
 # This is used to create the version string if a git repo is not available
-3.5.3
+3.5.4