diff --git a/web/src/app/chat/message/CodeBlock.tsx b/web/src/app/chat/message/CodeBlock.tsx
index ee6b6e6eab69..c1f2f99397cf 100644
--- a/web/src/app/chat/message/CodeBlock.tsx
+++ b/web/src/app/chat/message/CodeBlock.tsx
@@ -55,32 +55,33 @@ export const CodeBlock = memo(function CodeBlock({
     </div>
   );
 
+  if (typeof children === "string") {
+    return (
+      <span
+        className={`
+          font-mono 
+          text-gray-800 
+          bg-gray-50 
+          border 
+          border-gray-300 
+          rounded 
+          align-bottom
+          px-1
+          py-[3px]
+          text-xs 
+          inline-block
+          whitespace-pre-wrap 
+          break-words 
+          ${className}
+        `}
+      >
+        {children}
+      </span>
+    );
+  }
+
   const CodeContent = () => {
     if (!language) {
-      if (typeof children === "string") {
-        return (
-          <code
-            className={`
-            font-mono 
-            text-gray-800 
-            bg-gray-50 
-            border 
-            border-gray-300 
-            rounded 
-            px-1
-            py-[3px]
-            text-xs 
-            whitespace-pre-wrap 
-            break-words 
-            overflow-hidden
-            mb-1
-            ${className}
-          `}
-          >
-            {children}
-          </code>
-        );
-      }
       return (
         <pre style={CODE_BLOCK_PADDING}>
           <code className={`text-sm ${className}`}>
diff --git a/web/src/components/context/EmbeddingContext.tsx b/web/src/components/context/EmbeddingContext.tsx
index 33bb850a87cc..3d03b99b1d5a 100644
--- a/web/src/components/context/EmbeddingContext.tsx
+++ b/web/src/components/context/EmbeddingContext.tsx
@@ -74,7 +74,7 @@ export const EmbeddingFormProvider: React.FC<{
     if (stepFromUrl !== formStep) {
       setFormStep(stepFromUrl);
     }
-  }, [searchParams, formStep]);
+  }, [searchParams]);
 
   const contextValue: EmbeddingFormContextType = {
     formStep,
diff --git a/web/src/components/context/FormContext.tsx b/web/src/components/context/FormContext.tsx
index ee6e9dab786e..d445782f7183 100644
--- a/web/src/components/context/FormContext.tsx
+++ b/web/src/components/context/FormContext.tsx
@@ -73,7 +73,7 @@ export const FormProvider: React.FC<{
     if (stepFromUrl !== formStep) {
       setFormStep(stepFromUrl);
     }
-  }, [searchParams, formStep]);
+  }, [searchParams]);
 
   const contextValue: FormContextType = {
     formStep,