diff --git a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx
index dc91c57e..07418ceb 100644
--- a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/CodeSnippetModal/index.jsx
@@ -101,7 +101,7 @@ const ScriptTag = ({ embed }) => {
       <button
         disabled={copied}
         onClick={handleClick}
-        className={`disabled:border disabled:border-green-300 disabled:light:border-green-600 border border-transparent relative w-full font-mono flex hljs ${theme} light:border light:border-gray-700 text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none p-2.5`}
+        className={`disabled:border disabled:border-green-300 disabled:light:border-green-600 border border-transparent relative w-full font-mono flex hljs ${theme} light:border light:border-gray-700 text-white placeholder:text-theme-settings-input-placeholder text-sm rounded-lg focus:outline-primary-button active:outline-primary-button outline-none p-2.5 m-1`}
       >
         <div
           className="flex w-full text-left flex-col gap-y-1 pr-6 pl-4 whitespace-pre-line"
diff --git a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx
index 0593181d..ef615ab1 100644
--- a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/EmbedRow/EditEmbedModal/index.jsx
@@ -70,6 +70,12 @@ export default function EditEmbedModal({ embed, closeModal }) {
                 hint="Limit the amount of chats a session user can send with this embed in a 24 hour period. Zero is unlimited."
                 defaultValue={embed.max_chats_per_session}
               />
+              <NumberInput
+                name="message_limit"
+                title="Message History Limit"
+                hint="The number of previous messages to include in the chat context. Default is 20."
+                defaultValue={embed.message_limit}
+              />
               <BooleanInput
                 name="allow_model_override"
                 title="Enable dynamic model use"
diff --git a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx
index c0e4f977..46bd1119 100644
--- a/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx
+++ b/frontend/src/pages/GeneralSettings/ChatEmbedWidgets/EmbedConfigs/NewEmbedModal/index.jsx
@@ -20,6 +20,7 @@ export function enforceSubmissionSchema(form) {
     data.allow_temperature_override = false;
   if (!data.hasOwnProperty("allow_prompt_override"))
     data.allow_prompt_override = false;
+  if (!data.hasOwnProperty("message_limit")) data.message_limit = 20;
   return data;
 }
 
@@ -69,6 +70,12 @@ export default function NewEmbedModal({ closeModal }) {
                 title="Max chats per session"
                 hint="Limit the amount of chats a session user can send with this embed in a 24 hour period. Zero is unlimited."
               />
+              <NumberInput
+                name="message_limit"
+                title="Message History Limit"
+                hint="The number of previous messages to include in the chat context. Default is 20."
+                defaultValue={20}
+              />
               <BooleanInput
                 name="allow_model_override"
                 title="Enable dynamic model use"
@@ -150,6 +157,7 @@ export const WorkspaceSelection = ({ defaultValue = null }) => {
         {workspaces.map((workspace) => {
           return (
             <option
+              key={workspace.id}
               selected={defaultValue === workspace.id}
               value={workspace.id}
             >
diff --git a/server/models/embedConfig.js b/server/models/embedConfig.js
index bdeb13cf..202c5a68 100644
--- a/server/models/embedConfig.js
+++ b/server/models/embedConfig.js
@@ -14,6 +14,7 @@ const EmbedConfig = {
     "max_chats_per_session",
     "chat_mode",
     "workspace_id",
+    "message_limit",
   ],
 
   new: async function (data, creatorId = null) {
@@ -47,6 +48,10 @@ const EmbedConfig = {
             data?.max_chats_per_session,
             "max_chats_per_session"
           ),
+          message_limit: validatedCreationData(
+            data?.message_limit,
+            "message_limit"
+          ),
           createdBy: Number(creatorId) ?? null,
           workspace: {
             connect: { id: Number(data.workspace_id) },
@@ -190,6 +195,7 @@ const NUMBER_KEYS = [
   "max_chats_per_day",
   "max_chats_per_session",
   "workspace_id",
+  "message_limit",
 ];
 
 // Helper to validate a data object strictly into the proper format
diff --git a/server/prisma/migrations/20250709230835_init/migration.sql b/server/prisma/migrations/20250709230835_init/migration.sql
new file mode 100644
index 00000000..a183c5c2
--- /dev/null
+++ b/server/prisma/migrations/20250709230835_init/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "embed_configs" ADD COLUMN "message_limit" INTEGER DEFAULT 20;
diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma
index dbfbb7eb..999cf65d 100644
--- a/server/prisma/schema.prisma
+++ b/server/prisma/schema.prisma
@@ -240,6 +240,7 @@ model embed_configs {
   allow_prompt_override      Boolean       @default(false)
   max_chats_per_day          Int?
   max_chats_per_session      Int?
+  message_limit              Int?          @default(20)
   workspace_id               Int
   createdBy                  Int?
   usersId                    Int?
diff --git a/server/utils/chats/embed.js b/server/utils/chats/embed.js
index 67528d8e..d9320241 100644
--- a/server/utils/chats/embed.js
+++ b/server/utils/chats/embed.js
@@ -34,7 +34,7 @@ async function streamChatWithForEmbed(
   });
   const VectorDb = getVectorDbClass();
 
-  const messageLimit = 20;
+  const messageLimit = embed.message_limit ?? 20;
   const hasVectorizedSpace = await VectorDb.hasNamespace(embed.workspace.slug);
   const embeddingsCount = await VectorDb.namespaceCount(embed.workspace.slug);