diff --git a/apps/edr-freight-api/src/migrations/1719667261000-AddPostPaymentCompletedColumn.ts b/apps/edr-freight-api/src/migrations/1719667261000-AddPostPaymentCompletedColumn.ts
index b7846bac9..c755d6356 100644
--- a/apps/edr-freight-api/src/migrations/1719667261000-AddPostPaymentCompletedColumn.ts
+++ b/apps/edr-freight-api/src/migrations/1719667261000-AddPostPaymentCompletedColumn.ts
@@ -1,15 +1,51 @@
-import { MigrationInterface, QueryRunner } from 'typeorm';
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
 
 export class AddPostPaymentCompletedColumn1719667261000 implements MigrationInterface {
   name = 'AddPostPaymentCompletedColumn1719667261000';
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE freight.first_mile_deliveries ADD COLUMN IF NOT EXISTS is_post_payment_completed BOOLEAN NOT NULL DEFAULT false;`);
-    await queryRunner.query(`ALTER TABLE freight.last_mile_deliveries ADD COLUMN IF NOT EXISTS is_post_payment_completed BOOLEAN NOT NULL DEFAULT false;`);
+    const firstMileTable = await queryRunner.hasTable('freight.first_mile_deliveries');
+    if (firstMileTable) {
+      const hasColumn = await queryRunner.hasColumn('freight.first_mile_deliveries', 'is_post_payment_completed');
+      if (!hasColumn) {
+        await queryRunner.addColumn(
+          'freight.first_mile_deliveries',
+          new TableColumn({
+            name: 'is_post_payment_completed',
+            type: 'boolean',
+            default: false,
+            isNullable: false,
+          })
+        );
+      }
+    }
+
+    const lastMileTable = await queryRunner.hasTable('freight.last_mile_deliveries');
+    if (lastMileTable) {
+      const hasColumn = await queryRunner.hasColumn('freight.last_mile_deliveries', 'is_post_payment_completed');
+      if (!hasColumn) {
+        await queryRunner.addColumn(
+          'freight.last_mile_deliveries',
+          new TableColumn({
+            name: 'is_post_payment_completed',
+            type: 'boolean',
+            default: false,
+            isNullable: false,
+          })
+        );
+      }
+    }
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE freight.last_mile_deliveries DROP COLUMN IF EXISTS is_post_payment_completed;`);
-    await queryRunner.query(`ALTER TABLE freight.first_mile_deliveries DROP COLUMN IF EXISTS is_post_payment_completed;`);
+    const lastMileTable = await queryRunner.hasTable('freight.last_mile_deliveries');
+    if (lastMileTable) {
+      await queryRunner.dropColumn('freight.last_mile_deliveries', 'is_post_payment_completed');
+    }
+
+    const firstMileTable = await queryRunner.hasTable('freight.first_mile_deliveries');
+    if (firstMileTable) {
+      await queryRunner.dropColumn('freight.first_mile_deliveries', 'is_post_payment_completed');
+    }
   }
 }