diff --git a/apps/viewer/src/features/blocks/inputs/fileUpload/api/getUploadUrl.ts b/apps/viewer/src/features/blocks/inputs/fileUpload/api/getUploadUrl.ts
index 772d45682..0490f2ca7 100644
--- a/apps/viewer/src/features/blocks/inputs/fileUpload/api/getUploadUrl.ts
+++ b/apps/viewer/src/features/blocks/inputs/fileUpload/api/getUploadUrl.ts
@@ -58,7 +58,7 @@ export const getUploadUrl = publicProcedure
           'S3 not properly configured. Missing one of those variables: S3_ENDPOINT, S3_ACCESS_KEY, S3_SECRET_KEY',
       })
 
-    const hasReachedStorageLimit = await checkIfStorageLimitReached(typebotId)
+    await checkIfStorageLimitReached(typebotId)
     const publicTypebot = (await prisma.publicTypebot.findFirst({
       where: { typebotId },
       select: {
@@ -87,7 +87,7 @@ export const getUploadUrl = publicProcedure
 
     return {
       presignedUrl,
-      hasReachedStorageLimit,
+      hasReachedStorageLimit: false,
     }
   })
 
diff --git a/apps/viewer/src/features/chat/api/sendMessage.ts b/apps/viewer/src/features/chat/api/sendMessage.ts
index 3de097009..5fad9dec1 100644
--- a/apps/viewer/src/features/chat/api/sendMessage.ts
+++ b/apps/viewer/src/features/chat/api/sendMessage.ts
@@ -284,19 +284,12 @@ const getTypebot = async (
       message: 'Typebot is closed',
     })
 
-  const hasReachedLimit =
-    typebotQuery && 'typebot' in typebotQuery
-      ? await checkChatsUsage({
-          typebotId: parsedTypebot.id,
-          workspace: typebotQuery.typebot.workspace,
-        })
-      : false
-
-  if (hasReachedLimit)
-    throw new TRPCError({
-      code: 'FORBIDDEN',
-      message: 'You have reached your chats limit',
-    })
+  typebotQuery && 'typebot' in typebotQuery
+    ? await checkChatsUsage({
+        typebotId: parsedTypebot.id,
+        workspace: typebotQuery.typebot.workspace,
+      })
+    : false
 
   return parsedTypebot
 }
diff --git a/packages/emails/src/emails/AlmostReachedChatsLimitEmail.tsx b/packages/emails/src/emails/AlmostReachedChatsLimitEmail.tsx
index 2187640da..385d5d52d 100644
--- a/packages/emails/src/emails/AlmostReachedChatsLimitEmail.tsx
+++ b/packages/emails/src/emails/AlmostReachedChatsLimitEmail.tsx
@@ -49,12 +49,8 @@ export const AlmostReachedChatsLimitEmail = ({
             </Text>
             <Text>This limit will be reset on {readableResetDate}.</Text>
             <Text fontWeight="800">
-              Your bots won&apos;t start the chat if you reach the limit before
-              this date❗
-            </Text>
-            <Text>
-              If you need more monthly responses, you will need to upgrade your
-              plan.
+              Upon this limit your bots will still continue to chat, but we ask
+              you kindly to upgrade your monthly chats limit.
             </Text>
 
             <MjmlSpacer height="24px" />
diff --git a/packages/emails/src/emails/AlmostReachedStorageLimitEmail.tsx b/packages/emails/src/emails/AlmostReachedStorageLimitEmail.tsx
index 92a8cf021..e3394a16f 100644
--- a/packages/emails/src/emails/AlmostReachedStorageLimitEmail.tsx
+++ b/packages/emails/src/emails/AlmostReachedStorageLimitEmail.tsx
@@ -40,11 +40,9 @@ export const AlmostReachedStorageLimitEmail = ({
               limit.
             </Text>
             <Text fontWeight="800">
-              Your bots won&apos;t collect new files once you reach the limit❗
-            </Text>
-            <Text>
-              To make sure it won&apos;t happen, you need to upgrade your plan
-              or delete existing results to free up space.
+              Upon this limit your bots will still continue to collect new
+              files, but we ask you kindly to upgrade your storage limit or
+              delete existing results to free up space.
             </Text>
             <MjmlSpacer height="24px" />
             <Button link={url}>Upgrade workspace</Button>
diff --git a/packages/emails/src/emails/ReachedChatsLimitEmail.tsx b/packages/emails/src/emails/ReachedChatsLimitEmail.tsx
index fb6224771..914647c94 100644
--- a/packages/emails/src/emails/ReachedChatsLimitEmail.tsx
+++ b/packages/emails/src/emails/ReachedChatsLimitEmail.tsx
@@ -46,12 +46,9 @@ export const ReachedChatsLimitEmail = ({
               It just happened, you&apos;ve reached your monthly{' '}
               {readableChatsLimit} chats limit 😮
             </Text>
-            <Text fontWeight="800">
-              It means your bots are closed until {readableResetDate}❗
-            </Text>
             <Text>
-              If you&apos;d like to continue chatting with your users this
-              month, then you need to upgrade your plan. 🚀
+              If you&apos;d like your bots to continue chatting with your users
+              this month, then you need to upgrade your plan. 🚀
             </Text>
 
             <MjmlSpacer height="24px" />
diff --git a/packages/emails/src/emails/ReachedStorageLimitEmail.tsx b/packages/emails/src/emails/ReachedStorageLimitEmail.tsx
index 58dc09236..0872725d1 100644
--- a/packages/emails/src/emails/ReachedStorageLimitEmail.tsx
+++ b/packages/emails/src/emails/ReachedStorageLimitEmail.tsx
@@ -37,9 +37,6 @@ export const ReachedStorageLimitEmail = ({
               It just happened, you&apos;ve reached your {readableStorageLimit}{' '}
               storage limit 😮
             </Text>
-            <Text fontWeight="800">
-              It means your bots won&apos;t collect new files from your users❗
-            </Text>
             <Text>
               If you&apos;d like to continue collecting files, then you need to
               upgrade your plan or remove existing results to free up space. 🚀