diff --git a/src/backend/langflow/interface/custom/custom_component.py b/src/backend/langflow/interface/custom/custom_component.py
index d7dd280e6..c1de48a98 100644
--- a/src/backend/langflow/interface/custom/custom_component.py
+++ b/src/backend/langflow/interface/custom/custom_component.py
@@ -118,6 +118,8 @@ class CustomComponent(Component, extra=Extra.allow):
 
         build_method = build_methods[0]
         return_type = build_method["return_type"]
+        if not return_type:
+            return []
         # If the return type is not a Union, then we just return it as a list
         if "Union" not in return_type:
             return [return_type] if return_type in self.return_type_valid_list else []
diff --git a/tests/test_custom_component.py b/tests/test_custom_component.py
index 199906dda..01fe8b597 100644
--- a/tests/test_custom_component.py
+++ b/tests/test_custom_component.py
@@ -241,7 +241,7 @@ def test_custom_component_get_function_entrypoint_return_type():
         code=code_default, function_entrypoint_name="build"
     )
     return_type = custom_component.get_function_entrypoint_return_type
-    assert return_type == "Document"
+    assert return_type == ["Document"]
 
 
 def test_custom_component_get_main_class_name():
@@ -436,7 +436,7 @@ class MyClass(CustomComponent):
 
     custom_component = CustomComponent(code=my_code, function_entrypoint_name="build")
     return_type = custom_component.get_function_entrypoint_return_type
-    assert return_type is None
+    assert return_type == []
 
 
 def test_custom_component_get_main_class_name_no_main_class():
@@ -469,7 +469,7 @@ def test_build_config_no_code():
     component = CustomComponent(code=None)
 
     assert component.get_function_entrypoint_args == ""
-    assert component.get_function_entrypoint_return_type == ""
+    assert component.get_function_entrypoint_return_type == []
 
 
 @pytest.fixture
diff --git a/tests/test_vectorstore_template.py b/tests/test_vectorstore_template.py
index bac950ee1..1161d4982 100644
--- a/tests/test_vectorstore_template.py
+++ b/tests/test_vectorstore_template.py
@@ -9,4 +9,5 @@ def test_vectorstores_settings(client: TestClient):
     assert response.status_code == 200
     json_response = response.json()
     vectorstores = json_response["vectorstores"]
-    assert set(vectorstores.keys()) == set(settings.VECTORSTORES)
+    settings_vecs = set(settings.VECTORSTORES)
+    assert all(vs in vectorstores for vs in settings_vecs)