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);