diff --git a/changelog.d/6242.bugfix b/changelog.d/6242.bugfix
new file mode 100644
index 000000000..72f602aa8
--- /dev/null
+++ b/changelog.d/6242.bugfix
@@ -0,0 +1 @@
+Room: Avoid merging of bubbles if current timeline style does not allow.