diff --git a/src/lib/components/chat/Messages/CodeBlock.svelte b/src/lib/components/chat/Messages/CodeBlock.svelte
index 8c879bc75e..e3109a25e7 100644
--- a/src/lib/components/chat/Messages/CodeBlock.svelte
+++ b/src/lib/components/chat/Messages/CodeBlock.svelte
@@ -40,7 +40,7 @@
 	export let code = '';
 	export let attributes = {};
 
-	export let className = 'my-2 !text-left !direction-ltr';
+	export let className = 'my-2';
 	export let editorClassName = '';
 	export let stickyButtonsClassName = 'top-0';
 
diff --git a/src/lib/components/chat/Messages/Message.svelte b/src/lib/components/chat/Messages/Message.svelte
index c9cabd2e36..d2c28461c9 100644
--- a/src/lib/components/chat/Messages/Message.svelte
+++ b/src/lib/components/chat/Messages/Message.svelte
@@ -45,7 +45,7 @@
 	export let topPadding = false;
 </script>
 
-<li
+<div
 	class="flex flex-col justify-between px-5 mb-3 w-full {($settings?.widescreenMode ?? null)
 		? 'max-w-full'
 		: 'max-w-5xl'} mx-auto rounded-lg group"
@@ -124,4 +124,4 @@
 			/>
 		{/if}
 	{/if}
-</li>
+</div>
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index a8722912db..e67d85d760 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -640,12 +640,7 @@
 			</Name>
 
 			<div>
-				<div
-					class="chat-{message.role} w-full min-w-full markdown-prose {$settings.chatDirection ===
-					'RTL'
-						? 'text-right'
-						: ''}"
-				>
+				<div class="chat-{message.role} w-full min-w-full markdown-prose">
 					<div>
 						{#if (message?.statusHistory ?? [...(message?.status ? [message?.status] : [])]).length > 0}
 							{@const status = (
diff --git a/src/lib/components/chat/Messages/UserMessage.svelte b/src/lib/components/chat/Messages/UserMessage.svelte
index ae99fafefc..6369ad8604 100644
--- a/src/lib/components/chat/Messages/UserMessage.svelte
+++ b/src/lib/components/chat/Messages/UserMessage.svelte
@@ -330,7 +330,7 @@
 								? `max-w-[90%] px-5 py-2  bg-gray-50 dark:bg-gray-850 ${
 										message.files ? 'rounded-tr-lg' : ''
 									}`
-								: ' w-full'} {$settings.chatDirection === 'RTL' ? 'text-right' : ''}"
+								: ' w-full'}"
 						>
 							{#if message.content}
 								<Markdown