diff --git a/src/components/views/elements/RoomTopic.tsx b/src/components/views/elements/RoomTopic.tsx
index 35eb72515f..8f69f3c61e 100644
--- a/src/components/views/elements/RoomTopic.tsx
+++ b/src/components/views/elements/RoomTopic.tsx
@@ -36,7 +36,7 @@ interface IProps extends React.HTMLProps<HTMLDivElement> {
     room: Room;
 }
 
-export default function RoomTopic({ room, ...props }: IProps): JSX.Element {
+export default function RoomTopic({ room, className, ...props }: IProps): JSX.Element {
     const client = useContext(MatrixClientContext);
     const ref = useRef<HTMLDivElement>(null);
 
@@ -110,15 +110,13 @@ export default function RoomTopic({ room, ...props }: IProps): JSX.Element {
         }
     });
 
-    const className = classNames(props.className, "mx_RoomTopic");
-
     return (
         <TooltipTarget
             {...props}
             ref={ref}
             onClick={onClick}
             dir="auto"
-            tooltipTargetClassName={className}
+            tooltipTargetClassName={classNames(className, "mx_RoomTopic")}
             label={_t("room|read_topic")}
             alignment={Alignment.Bottom}
             ignoreHover={ignoreHover}