diff --git a/src/backend/base/langflow/api/v1/flows.py b/src/backend/base/langflow/api/v1/flows.py
index b5ca31f74..ce7d34cf6 100644
--- a/src/backend/base/langflow/api/v1/flows.py
+++ b/src/backend/base/langflow/api/v1/flows.py
@@ -38,7 +38,10 @@ def create_flow(
     db_flow.updated_at = datetime.now(timezone.utc)
 
     if db_flow.folder_id is None:
-        default_folder = session.exec(select(Folder).where(Folder.name == DEFAULT_FOLDER_NAME)).first()
+        # Make sure flows always have a folder
+        default_folder = session.exec(
+            select(Folder).where(Folder.name == DEFAULT_FOLDER_NAME, Folder.user_id == current_user.id)
+        ).first()
         if default_folder:
             db_flow.folder_id = default_folder.id
 
diff --git a/src/backend/base/langflow/api/v1/store.py b/src/backend/base/langflow/api/v1/store.py
index 7d0e9bff9..d645480d0 100644
--- a/src/backend/base/langflow/api/v1/store.py
+++ b/src/backend/base/langflow/api/v1/store.py
@@ -54,7 +54,7 @@ def check_if_store_is_enabled(
     settings_service=Depends(get_settings_service),
 ):
     return {
-        "enabled": settings_service.settings.STORE,
+        "enabled": settings_service.settings.store,
     }