diff --git a/web/src/ui/rightpanel/PinnedMessages.tsx b/web/src/ui/rightpanel/PinnedMessages.tsx
index 42a52ea..ca4140b 100644
--- a/web/src/ui/rightpanel/PinnedMessages.tsx
+++ b/web/src/ui/rightpanel/PinnedMessages.tsx
@@ -42,14 +42,12 @@ const PinnedMessages = () => {
 	if (!roomCtx) {
 		return null
 	} else if (!Array.isArray(pins?.pinned) || pins.pinned.length === 0) {
-		return <>No pinned messages</>
+		return <div className="empty">No pinned messages</div>
 	}
 	return <>
-		<RoomContext value={roomCtx}>
-			{reverseMap(pins.pinned, evtID => typeof evtID === "string" ? <div className="pinned-event" key={evtID}>
-				<PinnedMessage evtID={evtID} room={roomCtx.store} />
-			</div> : null)}
-		</RoomContext>
+		{reverseMap(pins.pinned, evtID => typeof evtID === "string" ? <div className="pinned-event" key={evtID}>
+			<PinnedMessage evtID={evtID} room={roomCtx.store} />
+		</div> : null)}
 	</>
 }
 
diff --git a/web/src/ui/rightpanel/RightPanel.css b/web/src/ui/rightpanel/RightPanel.css
index 66431ee..9f8c7b2 100644
--- a/web/src/ui/rightpanel/RightPanel.css
+++ b/web/src/ui/rightpanel/RightPanel.css
@@ -39,4 +39,8 @@ div.right-panel-content.pinned-messages {
 		border-bottom: 1px solid var(--border-color);
 		padding-bottom: .5rem;
 	}
+
+	> div.empty {
+		margin: auto;
+	}
 }