diff --git a/backend/open_webui/migrations/versions/c69f45358db4_add_folder_table.py b/backend/open_webui/migrations/versions/c69f45358db4_add_folder_table.py
index 016b0d419..9bbec3a59 100644
--- a/backend/open_webui/migrations/versions/c69f45358db4_add_folder_table.py
+++ b/backend/open_webui/migrations/versions/c69f45358db4_add_folder_table.py
@@ -18,9 +18,9 @@ depends_on = None
 def upgrade():
     op.create_table(
         "folder",
-        sa.Column("id", sa.Text(), primary_key=True, nullable=False),
+        sa.Column("id", sa.Text(), nullable=False),
         sa.Column("parent_id", sa.Text(), nullable=True),
-        sa.Column("user_id", sa.Text(), nullable=True),
+        sa.Column("user_id", sa.Text(), nullable=False),
         sa.Column("name", sa.Text(), nullable=False),
         sa.Column("items", sa.JSON(), nullable=True),
         sa.Column("meta", sa.JSON(), nullable=True),
@@ -34,6 +34,7 @@ def upgrade():
             server_default=sa.func.now(),
             onupdate=sa.func.now(),
         ),
+        sa.PrimaryKeyConstraint("id", "user_id")
     )