diff --git a/src/backend/langflow/api/v1/chat.py b/src/backend/langflow/api/v1/chat.py
index dd3407d1b..06a2fdda0 100644
--- a/src/backend/langflow/api/v1/chat.py
+++ b/src/backend/langflow/api/v1/chat.py
@@ -155,7 +155,7 @@ async def stream_build(flow_id: str):
                 )
             else:
                 input_keys_response = {
-                    "input_keys": {},
+                    "input_keys": None,
                     "memory_keys": [],
                     "handle_keys": [],
                 }
diff --git a/src/backend/langflow/chat/manager.py b/src/backend/langflow/chat/manager.py
index 1e93174e2..2c3427a12 100644
--- a/src/backend/langflow/chat/manager.py
+++ b/src/backend/langflow/chat/manager.py
@@ -117,7 +117,7 @@ class ChatManager:
         self, client_id: str, payload: Dict, langchain_object: Any
     ):
         # Process the graph data and chat message
-        chat_inputs = payload.pop("inputs", "")
+        chat_inputs = payload.pop("inputs", {})
         chat_inputs = ChatMessage(message=chat_inputs)
         self.chat_history.add_message(client_id, chat_inputs)
 
diff --git a/src/backend/langflow/chat/utils.py b/src/backend/langflow/chat/utils.py
index 7db65b8e3..17c976eb9 100644
--- a/src/backend/langflow/chat/utils.py
+++ b/src/backend/langflow/chat/utils.py
@@ -21,9 +21,9 @@ async def process_graph(
 
     # Generate result and thought
     try:
-        if not chat_inputs.message:
+        if chat_inputs.message is None:
             logger.debug("No message provided")
-            raise ValueError("No message provided")
+            chat_inputs.message = {}
 
         logger.debug("Generating result and thought")
         result, intermediate_steps = await get_result_and_steps(
diff --git a/src/backend/langflow/interface/initialize/vector_store.py b/src/backend/langflow/interface/initialize/vector_store.py
index 12cf054a5..8330d7611 100644
--- a/src/backend/langflow/interface/initialize/vector_store.py
+++ b/src/backend/langflow/interface/initialize/vector_store.py
@@ -171,11 +171,7 @@ def initialize_pinecone(class_object: Type[Pinecone], params: dict):
 def initialize_chroma(class_object: Type[Chroma], params: dict):
     """Initialize a ChromaDB object from the params"""
     if (  # type: ignore
-        "chroma_server_host" in params
-        or "chroma_server_http_port" in params
-        or "chroma_server_ssl_enabled" in params
-        or "chroma_server_grpc_port" in params
-        or "chroma_server_cors_allow_origins" in params
+        "chroma_server_host" in params or "chroma_server_http_port" in params
     ):
         import chromadb  # type: ignore
 
@@ -186,6 +182,14 @@ def initialize_chroma(class_object: Type[Chroma], params: dict):
         }
         chroma_settings = chromadb.config.Settings(**settings_params)
         params["client_settings"] = chroma_settings
+    else:
+        # remove all chroma_server_ keys from params
+        params = {
+            key: value
+            for key, value in params.items()
+            if not key.startswith("chroma_server_")
+        }
+
     persist = params.pop("persist", False)
     if not docs_in_params(params):
         params.pop("documents", None)
diff --git a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx
index 4eb69546e..9b0b74678 100644
--- a/src/frontend/src/components/chatComponent/buildTrigger/index.tsx
+++ b/src/frontend/src/components/chatComponent/buildTrigger/index.tsx
@@ -82,13 +82,15 @@ export default function BuildTrigger({
       const parsedData = JSON.parse(event.data);
       // if the event is the end of the stream, close the connection
       if (parsedData.end_of_stream) {
+        // Close the connection and finish
+        finished = true;
         eventSource.close();
 
         return;
       } else if (parsedData.log) {
         // If the event is a log, log it
         setSuccessData({ title: parsedData.log });
-      } else if (parsedData.input_keys) {
+      } else if (parsedData.input_keys !== undefined) {
         setTabsState((old) => {
           return {
             ...old,
diff --git a/src/frontend/src/components/chatComponent/index.tsx b/src/frontend/src/components/chatComponent/index.tsx
index 3cbe5bbf1..2b32dc0c4 100644
--- a/src/frontend/src/components/chatComponent/index.tsx
+++ b/src/frontend/src/components/chatComponent/index.tsx
@@ -62,8 +62,7 @@ export default function Chat({ flow }: ChatType) {
       tabsState &&
       tabsState[flow.id] &&
       tabsState[flow.id].formKeysData &&
-      tabsState[flow.id].formKeysData.input_keys &&
-      Object.keys(tabsState[flow.id].formKeysData.input_keys).length > 0
+      tabsState[flow.id].formKeysData.input_keys !== null
     ) {
       setCanOpen(true);
     } else {
diff --git a/src/frontend/src/modals/formModal/index.tsx b/src/frontend/src/modals/formModal/index.tsx
index 751eacea1..81b15559c 100644
--- a/src/frontend/src/modals/formModal/index.tsx
+++ b/src/frontend/src/modals/formModal/index.tsx
@@ -67,14 +67,17 @@ export default function FormModal({
   const id = useRef(flow.id);
   const tabsStateFlowId = tabsState[flow.id];
   const tabsStateFlowIdFormKeysData = tabsStateFlowId.formKeysData;
-  const [chatKey, setChatKey] = useState(
-    Object.keys(tabsState[flow.id].formKeysData.input_keys).find(
-      (k) =>
-        !tabsState[flow.id].formKeysData.handle_keys.some((j) => j === k) &&
-        tabsState[flow.id].formKeysData.input_keys[k] === ""
-    )
-  );
-
+  const [chatKey, setChatKey] = useState(() => {
+    if (tabsState[flow.id]?.formKeysData?.input_keys) {
+      return Object.keys(tabsState[flow.id].formKeysData.input_keys).find(
+        (k) =>
+          !tabsState[flow.id].formKeysData.handle_keys.some((j) => j === k) &&
+          tabsState[flow.id].formKeysData.input_keys[k] === ""
+      );
+    }
+    // TODO: return a sensible default
+    return "";
+  });
   useEffect(() => {
     if (messagesRef.current) {
       messagesRef.current.scrollTop = messagesRef.current.scrollHeight;
@@ -419,68 +422,70 @@ export default function FormModal({
                 </div>
               </div>
 
-              {Object.keys(tabsState[id.current].formKeysData.input_keys).map(
-                (i, k) => (
-                  <div className="file-component-accordion-div" key={k}>
-                    <AccordionComponent
-                      trigger={
-                        <div className="file-component-badge-div">
-                          <Badge variant="gray" size="md">
-                            {i}
-                          </Badge>
+              {tabsState[id.current]?.formKeysData?.input_keys
+                ? Object.keys(
+                    tabsState[id.current].formKeysData.input_keys
+                  ).map((i, k) => (
+                    <div className="file-component-accordion-div" key={k}>
+                      <AccordionComponent
+                        trigger={
+                          <div className="file-component-badge-div">
+                            <Badge variant="gray" size="md">
+                              {i}
+                            </Badge>
 
-                          <div
-                            className="-mb-1"
-                            onClick={(event) => {
-                              event.stopPropagation();
+                            <div
+                              className="-mb-1"
+                              onClick={(event) => {
+                                event.stopPropagation();
+                              }}
+                            >
+                              <ToggleShadComponent
+                                enabled={chatKey === i}
+                                setEnabled={(value) =>
+                                  handleOnCheckedChange(value, i)
+                                }
+                                size="small"
+                                disabled={tabsState[
+                                  id.current
+                                ].formKeysData.handle_keys.some((t) => t === i)}
+                              />
+                            </div>
+                          </div>
+                        }
+                        key={k}
+                        keyValue={i}
+                      >
+                        <div className="file-component-tab-column">
+                          {tabsState[id.current].formKeysData.handle_keys.some(
+                            (t) => t === i
+                          ) && (
+                            <div className="font-normal text-muted-foreground ">
+                              Source: Component
+                            </div>
+                          )}
+                          <Textarea
+                            className="custom-scroll"
+                            value={
+                              tabsState[id.current].formKeysData.input_keys[i]
+                            }
+                            onChange={(e) => {
+                              setTabsState((old) => {
+                                let newTabsState = _.cloneDeep(old);
+                                newTabsState[
+                                  id.current
+                                ].formKeysData.input_keys[i] = e.target.value;
+                                return newTabsState;
+                              });
                             }}
-                          >
-                            <ToggleShadComponent
-                              enabled={chatKey === i}
-                              setEnabled={(value) =>
-                                handleOnCheckedChange(value, i)
-                              }
-                              size="small"
-                              disabled={tabsState[
-                                id.current
-                              ].formKeysData.handle_keys.some((t) => t === i)}
-                            />
-                          </div>
+                            disabled={chatKey === i}
+                            placeholder="Enter text..."
+                          ></Textarea>
                         </div>
-                      }
-                      key={k}
-                      keyValue={i}
-                    >
-                      <div className="file-component-tab-column">
-                        {tabsState[id.current].formKeysData.handle_keys.some(
-                          (t) => t === i
-                        ) && (
-                          <div className="font-normal text-muted-foreground ">
-                            Source: Component
-                          </div>
-                        )}
-                        <Textarea
-                          className="custom-scroll"
-                          value={
-                            tabsState[id.current].formKeysData.input_keys[i]
-                          }
-                          onChange={(e) => {
-                            setTabsState((old) => {
-                              let newTabsState = _.cloneDeep(old);
-                              newTabsState[id.current].formKeysData.input_keys[
-                                i
-                              ] = e.target.value;
-                              return newTabsState;
-                            });
-                          }}
-                          disabled={chatKey === i}
-                          placeholder="Enter text..."
-                        ></Textarea>
-                      </div>
-                    </AccordionComponent>
-                  </div>
-                )
-              )}
+                      </AccordionComponent>
+                    </div>
+                  ))
+                : null}
               {tabsState[id.current].formKeysData.memory_keys.map((i, k) => (
                 <div className="file-component-accordion-div" key={k}>
                   <AccordionComponent
diff --git a/src/frontend/src/utils/utils.ts b/src/frontend/src/utils/utils.ts
index 462e72084..5e30d99cf 100644
--- a/src/frontend/src/utils/utils.ts
+++ b/src/frontend/src/utils/utils.ts
@@ -248,6 +248,27 @@ export function buildTweakObject(tweak) {
   return tweakString;
 }
 
+/**
+ * Function to get Chat Input Field
+ * @param {FlowType} flow - The current flow.
+ * @param {TabsState} tabsState - The current tabs state.
+ * @returns {string} - The chat input field
+ */
+export function getChatInputField(flow: FlowType, tabsState?: TabsState) {
+  let chat_input_field = "text";
+
+  if (
+    tabsState[flow.id] &&
+    tabsState[flow.id].formKeysData &&
+    tabsState[flow.id].formKeysData.input_keys
+  ) {
+    chat_input_field = Object.keys(
+      tabsState[flow.id].formKeysData.input_keys
+    )[0];
+  }
+  return chat_input_field;
+}
+
 /**
  * Function to get the python code for the API
  * @param {string} flowId - The id of the flow
@@ -365,6 +386,7 @@ export function getWidgetCode(flow: FlowType, tabsState?: TabsState): string {
   const flowId = flow.id;
   const flowName = flow.name;
   const inputs = buildInputs(tabsState, flow.id);
+  let chat_input_field = getChatInputField(flow, tabsState);
 
   return `<script src="https://cdn.jsdelivr.net/gh/logspace-ai/langflow-embedded-chat@main/dist/build/static/js/bundle.min.js"></script>
 
@@ -377,11 +399,9 @@ chat_input_field: Input key that you want the chat to send the user message with
   ${
     tabsState[flow.id] && tabsState[flow.id].formKeysData
       ? `chat_inputs='${inputs}'
-  chat_input_field="${
-    Object.keys(tabsState[flow.id].formKeysData.input_keys)[0]
-  }"
+  chat_input_field="${chat_input_field}"
   `
       : ""
-  }host_url="http://localhost:7860" 
+  }host_url="http://localhost:7860"
 ></langflow-chat>`;
 }