From 1dd0246d2a579bb8b1faa7cfe18b1d928af52257 Mon Sep 17 00:00:00 2001
From: Thunder <thunder@disroot.org>
Date: Wed, 25 Mar 2026 12:48:20 +0200
Subject: [PATCH] fix confusing ui for client side embed settings

previously you could enable client side embeds in encrypted rooms,
while disabling them in unencrypted rooms, even though turning off the
unencrypted room toggle hid the encrypted rooms toggle
---
 .../fix_confusing_ui_with_client_side_embeds_setting.md      | 5 +++++
 src/app/features/room/RoomTimeline.tsx                       | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fix_confusing_ui_with_client_side_embeds_setting.md

diff --git a/.changeset/fix_confusing_ui_with_client_side_embeds_setting.md b/.changeset/fix_confusing_ui_with_client_side_embeds_setting.md
new file mode 100644
index 000000000..6fd108a67
--- /dev/null
+++ b/.changeset/fix_confusing_ui_with_client_side_embeds_setting.md
@@ -0,0 +1,5 @@
+---
+default: patch
+---
+
+# Fix confusing ui with `Client Side Embeds in Encrypted Rooms` setting
diff --git a/src/app/features/room/RoomTimeline.tsx b/src/app/features/room/RoomTimeline.tsx
index dd655deec..c3af1ebc3 100644
--- a/src/app/features/room/RoomTimeline.tsx
+++ b/src/app/features/room/RoomTimeline.tsx
@@ -145,7 +145,7 @@ export function RoomTimeline({
 
   const showUrlPreview = room.hasEncryptionStateEvent() ? encUrlPreview : urlPreview;
   const showClientUrlPreview = room.hasEncryptionStateEvent()
-    ? encClientUrlPreview
+    ? clientUrlPreview && encClientUrlPreview
     : clientUrlPreview;
 
   const nicknames = useAtomValue(nicknamesAtom);