diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts
index ddce6623844a5..d1be0516d07e2 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts
@@ -112,8 +112,10 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
       } catch (error) {
         await queryRunner.rollbackTransaction();
 
-        // PostgreSQL error code 42704: undefined_object (index does not exist)
-        if (error.code === '42704') {
+        // PostgreSQL error codes for non-existent index:
+        // - 42704: undefined_object
+        // - 42P01: undefined_table (index treated as relation)
+        if (error.code === '42704' || error.code === '42P01') {
           this.logger.log(
             `Index ${index.name} does not exist in schema ${schemaName}, removing metadata`,
           );
@@ -124,6 +126,9 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration
           );
           hasRemovedIndexMetadata = true;
         } else {
+          this.logger.error(
+            `Failed to rename index ${index.name}, error code: ${error.code}`,
+          );
           throw error;
         }
       } finally {