diff --git a/apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts b/apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts
index f3bc8b3f4..f285dc4d3 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts
+++ b/apps/builder/src/features/blocks/logic/typebotLink/api/getLinkedTypebots.ts
@@ -58,7 +58,7 @@ export const getLinkedTypebots = authenticatedProcedure
         createdAt: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
@@ -109,7 +109,7 @@ export const getLinkedTypebots = authenticatedProcedure
           createdAt: true,
           workspace: {
             select: {
-              isQuarantined: true,
+              isSuspended: true,
               isPastDue: true,
               members: {
                 select: {
diff --git a/apps/builder/src/features/collaboration/api/getCollaborators.ts b/apps/builder/src/features/collaboration/api/getCollaborators.ts
index 46de8bcc3..fbee270e4 100644
--- a/apps/builder/src/features/collaboration/api/getCollaborators.ts
+++ b/apps/builder/src/features/collaboration/api/getCollaborators.ts
@@ -34,7 +34,7 @@ export const getCollaborators = authenticatedProcedure
         collaborators: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/results/api/deleteResults.ts b/apps/builder/src/features/results/api/deleteResults.ts
index a56ac7bf6..146250d7e 100644
--- a/apps/builder/src/features/results/api/deleteResults.ts
+++ b/apps/builder/src/features/results/api/deleteResults.ts
@@ -39,7 +39,7 @@ export const deleteResults = authenticatedProcedure
         groups: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/results/api/getResult.ts b/apps/builder/src/features/results/api/getResult.ts
index 484ce66cf..a81fab497 100644
--- a/apps/builder/src/features/results/api/getResult.ts
+++ b/apps/builder/src/features/results/api/getResult.ts
@@ -36,7 +36,7 @@ export const getResult = authenticatedProcedure
         groups: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/results/api/getResultLogs.ts b/apps/builder/src/features/results/api/getResultLogs.ts
index 72a8c340e..a2fdcdc01 100644
--- a/apps/builder/src/features/results/api/getResultLogs.ts
+++ b/apps/builder/src/features/results/api/getResultLogs.ts
@@ -31,7 +31,7 @@ export const getResultLogs = authenticatedProcedure
         groups: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/results/api/getResults.ts b/apps/builder/src/features/results/api/getResults.ts
index 10d6b0571..646515202 100644
--- a/apps/builder/src/features/results/api/getResults.ts
+++ b/apps/builder/src/features/results/api/getResults.ts
@@ -53,7 +53,7 @@ export const getResults = authenticatedProcedure
         },
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/typebot/api/deleteTypebot.ts b/apps/builder/src/features/typebot/api/deleteTypebot.ts
index 8ad8e16c4..32ee96fcf 100644
--- a/apps/builder/src/features/typebot/api/deleteTypebot.ts
+++ b/apps/builder/src/features/typebot/api/deleteTypebot.ts
@@ -36,7 +36,7 @@ export const deleteTypebot = authenticatedProcedure
         groups: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/typebot/api/getPublishedTypebot.ts b/apps/builder/src/features/typebot/api/getPublishedTypebot.ts
index 8e7e8e216..e90ce6541 100644
--- a/apps/builder/src/features/typebot/api/getPublishedTypebot.ts
+++ b/apps/builder/src/features/typebot/api/getPublishedTypebot.ts
@@ -54,7 +54,7 @@ export const getPublishedTypebot = authenticatedProcedure
           publishedTypebot: true,
           workspace: {
             select: {
-              isQuarantined: true,
+              isSuspended: true,
               isPastDue: true,
               members: {
                 select: {
diff --git a/apps/builder/src/features/typebot/api/getTypebot.ts b/apps/builder/src/features/typebot/api/getTypebot.ts
index 73de37213..e63795696 100644
--- a/apps/builder/src/features/typebot/api/getTypebot.ts
+++ b/apps/builder/src/features/typebot/api/getTypebot.ts
@@ -43,7 +43,7 @@ export const getTypebot = authenticatedProcedure
           collaborators: true,
           workspace: {
             select: {
-              isQuarantined: true,
+              isSuspended: true,
               isPastDue: true,
               members: {
                 select: {
diff --git a/apps/builder/src/features/typebot/api/publishTypebot.ts b/apps/builder/src/features/typebot/api/publishTypebot.ts
index d034b51bf..5afa56fda 100644
--- a/apps/builder/src/features/typebot/api/publishTypebot.ts
+++ b/apps/builder/src/features/typebot/api/publishTypebot.ts
@@ -46,7 +46,7 @@ export const publishTypebot = authenticatedProcedure
         workspace: {
           select: {
             plan: true,
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/typebot/api/unpublishTypebot.ts b/apps/builder/src/features/typebot/api/unpublishTypebot.ts
index 215cff6d8..61883b421 100644
--- a/apps/builder/src/features/typebot/api/unpublishTypebot.ts
+++ b/apps/builder/src/features/typebot/api/unpublishTypebot.ts
@@ -34,7 +34,7 @@ export const unpublishTypebot = authenticatedProcedure
         publishedTypebot: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {
diff --git a/apps/builder/src/features/typebot/api/updateTypebot.ts b/apps/builder/src/features/typebot/api/updateTypebot.ts
index 9d4c21f47..82691d95a 100644
--- a/apps/builder/src/features/typebot/api/updateTypebot.ts
+++ b/apps/builder/src/features/typebot/api/updateTypebot.ts
@@ -89,7 +89,7 @@ export const updateTypebot = authenticatedProcedure
             select: {
               id: true,
               plan: true,
-              isQuarantined: true,
+              isSuspended: true,
               isPastDue: true,
               members: {
                 select: {
diff --git a/apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts b/apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts
index b3f134987..2d9a86fd6 100644
--- a/apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts
+++ b/apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts
@@ -10,13 +10,13 @@ export const isReadTypebotForbidden = async (
   typebot: {
     collaborators: Pick<CollaboratorsOnTypebots, 'userId'>[]
   } & {
-    workspace: Pick<Workspace, 'isQuarantined' | 'isPastDue'> & {
+    workspace: Pick<Workspace, 'isSuspended' | 'isPastDue'> & {
       members: Pick<MemberInWorkspace, 'userId'>[]
     }
   },
   user: Pick<User, 'email' | 'id'>
 ) =>
-  typebot.workspace.isQuarantined ||
+  typebot.workspace.isSuspended ||
   typebot.workspace.isPastDue ||
   (env.ADMIN_EMAIL !== user.email &&
     !typebot.collaborators.some(
diff --git a/apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts b/apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts
index bcdd05f86..62a12e6dd 100644
--- a/apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts
+++ b/apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts
@@ -10,22 +10,22 @@ export const isWriteTypebotForbidden = async (
   typebot: {
     collaborators: Pick<CollaboratorsOnTypebots, 'userId' | 'type'>[]
   } & {
-    workspace: Pick<Workspace, 'isQuarantined' | 'isPastDue'> & {
+    workspace: Pick<Workspace, 'isSuspended' | 'isPastDue'> & {
       members: Pick<MemberInWorkspace, 'userId' | 'role'>[]
     }
   },
   user: Pick<User, 'id'>
 ) => {
   return (
-    typebot.workspace.isQuarantined ||
+    typebot.workspace.isSuspended ||
     typebot.workspace.isPastDue ||
-    !(
-      typebot.collaborators.find(
-        (collaborator) => collaborator.userId === user.id
-      )?.type === CollaborationType.WRITE &&
-      typebot.workspace.members.some(
+    (!typebot.collaborators.some(
+      (collaborator) =>
+        collaborator.userId === user.id &&
+        collaborator.type === CollaborationType.WRITE
+    ) &&
+      !typebot.workspace.members.some(
         (m) => m.userId === user.id && m.role !== 'GUEST'
-      )
-    )
+      ))
   )
 }
diff --git a/apps/builder/src/features/upload/api/generateUploadUrl.ts b/apps/builder/src/features/upload/api/generateUploadUrl.ts
index 2af3afb67..7438764ee 100644
--- a/apps/builder/src/features/upload/api/generateUploadUrl.ts
+++ b/apps/builder/src/features/upload/api/generateUploadUrl.ts
@@ -150,7 +150,7 @@ const parseFilePath = async ({
       workspace: {
         select: {
           plan: true,
-          isQuarantined: true,
+          isSuspended: true,
           isPastDue: true,
           members: {
             select: {
diff --git a/apps/builder/src/features/whatsapp/startWhatsAppPreview.ts b/apps/builder/src/features/whatsapp/startWhatsAppPreview.ts
index f978fbecd..ae49bff20 100644
--- a/apps/builder/src/features/whatsapp/startWhatsAppPreview.ts
+++ b/apps/builder/src/features/whatsapp/startWhatsAppPreview.ts
@@ -59,7 +59,7 @@ export const startWhatsAppPreview = authenticatedProcedure
         id: true,
         workspace: {
           select: {
-            isQuarantined: true,
+            isSuspended: true,
             isPastDue: true,
             members: {
               select: {