diff --git a/res/css/_sc/feature-improvement/feature__IRCLayout__hideAvatar/index.pcss b/res/css/_sc/feature-improvement/feature__IRCLayout__hideAvatar/index.pcss
index 85eb6af5ff3..2caf5f677a2 100644
--- a/res/css/_sc/feature-improvement/feature__IRCLayout__hideAvatar/index.pcss
+++ b/res/css/_sc/feature-improvement/feature__IRCLayout__hideAvatar/index.pcss
@@ -19,7 +19,7 @@ limitations under the License.
      --icon-width: 0px; /* Align vertically */
 
     .mx_EventTile {
-        &[data-layout="irc"] {
+        &[data-layout="irc"][data-avatar="false"] {
             .mx_EventTile_avatar,
             .mx_BaseAvatar {
                 display: none;
@@ -43,7 +43,7 @@ limitations under the License.
     }
 
     .mx_GenericEventListSummary {
-        &[data-layout="irc"] {
+        &[data-layout="irc"][data-avatar="false"] {
             /* For collapsed GELS */
             .mx_GenericEventListSummary_avatars {
                 display: none;
diff --git a/src/components/views/elements/GenericEventListSummary.tsx b/src/components/views/elements/GenericEventListSummary.tsx
index eaf58f9742a..53c9287d074 100644
--- a/src/components/views/elements/GenericEventListSummary.tsx
+++ b/src/components/views/elements/GenericEventListSummary.tsx
@@ -76,6 +76,7 @@ const GenericEventListSummary: React.FC<IProps> = ({
                 data-scroll-tokens={eventIds}
                 data-expanded={true}
                 data-layout={layout}
+                data-avatar={false} // [sc]
             >
                 <ol className="mx_GenericEventListSummary_unstyledList">{children}</ol>
             </li>
@@ -139,6 +140,7 @@ const GenericEventListSummary: React.FC<IProps> = ({
             data-expanded={expanded + ""}
             data-layout={layout}
             data-testid={testId}
+            data-avatar={false} // [sc]
         >
             <AccessibleButton
                 kind="link_inline"
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 3c7159101a2..9624c05ff92 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -1256,6 +1256,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         "data-has-reply": !!replyChain,
                         "data-layout": this.props.layout,
                         "data-self": isOwnEvent,
+                        "data-avatar": "false", // [sc]
                         "data-event-id": this.props.mxEvent.getId(),
                         "onMouseEnter": () => this.setState({ hover: true }),
                         "onMouseLeave": () => this.setState({ hover: false }),
@@ -1312,6 +1313,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                         "data-shape": this.context.timelineRenderingType,
                         "data-self": isOwnEvent,
                         "data-has-reply": !!replyChain,
+                        "data-avatar": "false", // [sc]
                         "onMouseEnter": () => this.setState({ hover: true }),
                         "onMouseLeave": () => this.setState({ hover: false }),
                         "onClick": (ev: MouseEvent) => {
@@ -1488,6 +1490,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                             "data-self": isOwnEvent,
                             "data-event-id": this.props.mxEvent.getId(),
                             "data-has-reply": !!replyChain,
+                            "data-avatar": "false", // [sc]
                             "onMouseEnter": () => this.setState({ hover: true }),
                             "onMouseLeave": () => this.setState({ hover: false }),
                         },
@@ -1555,6 +1558,7 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
                             "data-self": isOwnEvent,
                             "data-event-id": this.props.mxEvent.getId(),
                             "data-has-reply": !!replyChain,
+                            "data-avatar": "false", // [sc]
                             "onMouseEnter": () => this.setState({ hover: true }),
                             "onMouseLeave": () => this.setState({ hover: false }),
                         },