diff --git a/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.ts b/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.ts
index f9fad80e6b1..f7ef9e37c5a 100644
--- a/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.ts
+++ b/packages/twenty-server/src/engine/twenty-orm/error-handling/compute-twenty-orm-exception.ts
@@ -58,6 +58,19 @@ export const computeTwentyORMException = async (
       );
     }
 
+    if (
+      errorCode === POSTGRESQL_ERROR_CODES.DEADLOCK_DETECTED ||
+      errorCode === POSTGRESQL_ERROR_CODES.SERIALIZATION_FAILURE
+    ) {
+      return new TwentyORMException(
+        error.message,
+        TwentyORMExceptionCode.QUERY_READ_TIMEOUT,
+        {
+          userFriendlyMessage: msg`We are experiencing a temporary issue with our database. Please try again later.`,
+        },
+      );
+    }
+
     if (
       isDefined(errorCode) &&
       Object.values(POSTGRESQL_ERROR_CODES).includes(errorCode)