diff --git a/apps/web/app/(ee)/api/cron/folders/delete/route.ts b/apps/web/app/(ee)/api/cron/folders/delete/route.ts
index 41638725f3d..fda64aa8894 100644
--- a/apps/web/app/(ee)/api/cron/folders/delete/route.ts
+++ b/apps/web/app/(ee)/api/cron/folders/delete/route.ts
@@ -39,6 +39,15 @@ export async function POST(req: Request) {
     });
 
     if (linksToUpdate.length === 0) {
+      await prisma.projectUsers.updateMany({
+        where: {
+          defaultFolderId: folderId,
+        },
+        data: {
+          defaultFolderId: null,
+        },
+      });
+
       await prisma.folder.delete({
         where: {
           id: folderId,
diff --git a/apps/web/lib/api/folders/delete-workspace-folders.ts b/apps/web/lib/api/folders/delete-workspace-folders.ts
index a1bb9d2dabd..4a2386cded0 100644
--- a/apps/web/lib/api/folders/delete-workspace-folders.ts
+++ b/apps/web/lib/api/folders/delete-workspace-folders.ts
@@ -39,6 +39,16 @@ export async function deleteWorkspaceFolders({
     return;
   }
 
+  await prisma.projectUsers.updateMany({
+    where: {
+      projectId: workspaceId,
+      defaultFolderId: { in: folders.map(({ id }) => id) },
+    },
+    data: {
+      defaultFolderId: null,
+    },
+  });
+
   return await Promise.all([
     ...folders.map(({ id }) =>
       queueFolderDeletion({