diff --git a/src/backend/langflow/components/vectorstores/Faiss.py b/src/backend/langflow/components/vectorstores/Faiss.py
new file mode 100644
index 000000000..fd7c99bf2
--- /dev/null
+++ b/src/backend/langflow/components/vectorstores/Faiss.py
@@ -0,0 +1,64 @@
+from typing import List, Optional, Union
+from langflow import CustomComponent
+
+from langchain.vectorstores import FAISS
+from langchain.vectorstores.base import VectorStore
+from langchain.schema import BaseRetriever
+from langchain.schema import Document
+from langchain.embeddings.base import Embeddings
+
+
+class FAISSComponent(CustomComponent):
+    """
+    A custom component for implementing a Vector Store using FAISS.
+    """
+
+    display_name: str = "FAISS (Custom Component)"
+    description: str = "Implementation of Vector Store using FAISS"
+    documentation = "https://python.langchain.com/docs/integrations/vectorstores/faiss"
+    beta = True
+
+    def build_config(self):
+        return {
+            "persistence": {
+                "display_name": "Persistence",
+                "options": ["In-Memory", "LocalDirectory"],
+                "value": "In-Memory",
+            },
+            "folder_path": {
+                "display_name": "Folder Path",
+                "required": False,
+            },
+            "index_name": {"display_name": "Index Name", "value": "faiss_index"},
+            "documents": {"display_name": "Documents", "is_list": True},
+            "embeddings": {"display_name": "Embeddings"},
+            "code": {"display_name": "Code", "show": False},
+        }
+
+    def build(
+        self,
+        persistence: str,
+        index_name: str,
+        embeddings: Embeddings,
+        folder_path: Optional[str] = None,
+        documents: Optional[List[Document]] = None,
+    ) -> Union[VectorStore, BaseRetriever]:
+        if persistence == "LocalDirectory" and not folder_path:
+            raise ValueError("Folder path is required for local directory persistence")
+
+        # Load if persistence is LocalDirectory
+        if documents is None and folder_path is not None:
+            return FAISS.load_local(
+                folder_path=folder_path, embeddings=embeddings, index_name=index_name
+            )
+
+        if documents is None:
+            raise ValueError("Documents must be provided in the params")
+
+        db = FAISS.from_documents(documents=documents, embedding=embeddings)
+
+        # Save if persistence is LocalDirectory
+        if persistence == "LocalDirectory" and folder_path is not None:
+            db.save_local(folder_path=folder_path, index_name=index_name)
+
+        return db
diff --git a/src/backend/langflow/config.yaml b/src/backend/langflow/config.yaml
index 48f7b1da1..994c1621f 100644
--- a/src/backend/langflow/config.yaml
+++ b/src/backend/langflow/config.yaml
@@ -271,8 +271,8 @@ vectorstores:
     documentation: "https://python.langchain.com/docs/modules/data_connection/vectorstores/integrations/qdrant"
   Weaviate:
     documentation: "https://python.langchain.com/docs/modules/data_connection/vectorstores/integrations/weaviate"
-  FAISS:
-    documentation: "https://python.langchain.com/docs/modules/data_connection/vectorstores/integrations/faiss"
+#  FAISS:
+#    documentation: "https://python.langchain.com/docs/modules/data_connection/vectorstores/integrations/faiss"
   Pinecone:
     documentation: "https://python.langchain.com/docs/modules/data_connection/vectorstores/integrations/pinecone"
   SupabaseVectorStore: