diff --git a/src/backend/langflow/chat/manager.py b/src/backend/langflow/chat/manager.py
index b4ccd931e..17968e32a 100644
--- a/src/backend/langflow/chat/manager.py
+++ b/src/backend/langflow/chat/manager.py
@@ -135,6 +135,7 @@ class ChatManager:
                 chat_inputs=chat_inputs,
                 websocket=self.active_connections[client_id],
             )
+            self.cache_manager.set(client_id, langchain_object)
         except Exception as e:
             # Log stack trace
             logger.exception(e)
diff --git a/src/backend/langflow/core/celeryconfig.py b/src/backend/langflow/core/celeryconfig.py
index d7827b713..6747135ae 100644
--- a/src/backend/langflow/core/celeryconfig.py
+++ b/src/backend/langflow/core/celeryconfig.py
@@ -3,11 +3,11 @@ import os
 
 langflow_redis_host = os.environ.get("LANGFLOW_REDIS_HOST")
 langflow_redis_port = os.environ.get("LANGFLOW_REDIS_PORT")
-if langflow_redis_host and langflow_redis_port:
-    broker_url = f"redis://{langflow_redis_host}:{langflow_redis_port}/0"
-    result_backend = f"redis://{langflow_redis_host}:{langflow_redis_port}/0"
-else:
+if "BROKER_URL" in os.environ and "RESULT_BACKEND" in os.environ:
     broker_url = os.environ.get("BROKER_URL", "redis://localhost:6379/0")
     result_backend = os.environ.get("RESULT_BACKEND", "redis://localhost:6379/0")
+elif langflow_redis_host and langflow_redis_port:
+    broker_url = f"redis://{langflow_redis_host}:{langflow_redis_port}/0"
+    result_backend = f"redis://{langflow_redis_host}:{langflow_redis_port}/0"
 # tasks should be json or pickle
 accept_content = ["json", "pickle"]