diff --git a/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js b/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js
index 7dbc9b0a..651db1c0 100644
--- a/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js
+++ b/src/platform/web/ui/session/room/timeline/ReplyPreviewView.js
@@ -28,7 +28,8 @@ export class ReplyPreviewView extends TemplateView {
     _renderError({ error, avatar, senderName }) {
         const errorMessage = this._getErrorMessage(error);
         const children = [tag.span({ className: "statusMessage" }, errorMessage), tag.br()];
-        const reply = avatar && senderName? this._renderReplyHeader(avatar, senderName, children) : tag.blockquote(children);
+        const reply = avatar && senderName ? this._renderReplyHeader(avatar, senderName, children) :
+                                             tag.blockquote({ className: "ReplyPreviewView" }, children);
         return reply;
     }
 
@@ -52,8 +53,9 @@ export class ReplyPreviewView extends TemplateView {
         return reply;
     }
 
-    _renderReplyHeader(avatar, displayName, children) {
-        return tag.blockquote([
+    _renderReplyHeader(avatar, displayName, children = []) {
+        return tag.blockquote({ className: "ReplyPreviewView" },
+            [
             tag.a({ className: "link", href: "#" }, "In reply to"),
             tag.a({ className: "pill", href: "#" }, [renderStaticAvatar(avatar, 12), displayName]),
             tag.br(),
diff --git a/src/platform/web/ui/session/room/timeline/TextMessageView.js b/src/platform/web/ui/session/room/timeline/TextMessageView.js
index b0733482..b16ab8a9 100644
--- a/src/platform/web/ui/session/room/timeline/TextMessageView.js
+++ b/src/platform/web/ui/session/room/timeline/TextMessageView.js
@@ -29,7 +29,7 @@ export class TextMessageView extends BaseMessageView {
         }, t.mapView(vm => vm.replyPreviewBody, reply => reply ? new ReplyPreviewView(reply): null));
 
         t.mapSideEffect(vm => vm.body, body => {
-            while (container.lastChild && container.lastChild.tagName !== "BLOCKQUOTE") {
+            while (container.lastChild && container.lastChild.className !== "ReplyPreviewView") {
                 container.removeChild(container.lastChild);
             }
             for (const part of body.parts) {