diff --git a/database/migrations/2025_03_29_204400_revert_some_local_volume_encryption.php b/database/migrations/2025_03_29_204400_revert_some_local_volume_encryption.php
index 683f1be3d..13419e82f 100644
--- a/database/migrations/2025_03_29_204400_revert_some_local_volume_encryption.php
+++ b/database/migrations/2025_03_29_204400_revert_some_local_volume_encryption.php
@@ -13,15 +13,17 @@ return new class extends Migration
     public function up(): void
     {
         if (DB::table('local_file_volumes')->exists()) {
+            // First, get all volumes and decrypt their values
+            $decryptedVolumes = collect();
+
             DB::table('local_file_volumes')
                 ->orderBy('id')
-                ->chunk(100, function ($volumes) {
+                ->chunk(100, function ($volumes) use (&$decryptedVolumes) {
                     foreach ($volumes as $volume) {
-                        DB::beginTransaction();
-
                         try {
                             $fs_path = $volume->fs_path;
                             $mount_path = $volume->mount_path;
+
                             try {
                                 if ($fs_path) {
                                     $fs_path = Crypt::decryptString($fs_path);
@@ -36,18 +38,60 @@ return new class extends Migration
                             } catch (\Exception $e) {
                             }
 
-                            DB::table('local_file_volumes')->where('id', $volume->id)->update([
+                            $decryptedVolumes->push([
+                                'id' => $volume->id,
                                 'fs_path' => $fs_path,
                                 'mount_path' => $mount_path,
+                                'resource_id' => $volume->resource_id,
+                                'resource_type' => $volume->resource_type,
                             ]);
-                            echo "Updated volume {$volume->id}\n";
+
                         } catch (\Exception $e) {
-                            echo "Error encrypting local file volume fields: {$e->getMessage()}\n";
-                            Log::error('Error encrypting local file volume fields: '.$e->getMessage());
+                            echo "Error decrypting volume {$volume->id}: {$e->getMessage()}\n";
+                            Log::error("Error decrypting volume {$volume->id}: ".$e->getMessage());
                         }
-                        DB::commit();
                     }
                 });
+
+            // Group by the unique constraint fields and keep only the first occurrence
+            $uniqueVolumes = $decryptedVolumes->groupBy(function ($volume) {
+                return $volume['mount_path'].'|'.$volume['resource_id'].'|'.$volume['resource_type'];
+            })->map(function ($group) {
+                return $group->first();
+            });
+
+            // Get IDs to delete (all except the ones we're keeping)
+            $idsToKeep = $uniqueVolumes->pluck('id')->toArray();
+            $idsToDelete = $decryptedVolumes->pluck('id')->diff($idsToKeep)->toArray();
+
+            // Delete duplicate records
+            if (! empty($idsToDelete)) {
+                // Show details of volumes being deleted
+                $volumesToDelete = $decryptedVolumes->whereIn('id', $idsToDelete);
+                echo "\nVolumes to be deleted:\n";
+                foreach ($volumesToDelete as $volume) {
+                    echo "ID: {$volume['id']}, Mount Path: {$volume['mount_path']}, Resource ID: {$volume['resource_id']}, Resource Type: {$volume['resource_type']}\n";
+                    echo "FS Path: {$volume['fs_path']}\n";
+                    echo "-------------------\n";
+                }
+
+                DB::table('local_file_volumes')->whereIn('id', $idsToDelete)->delete();
+                echo 'Deleted '.count($idsToDelete)." duplicate volume(s)\n";
+            }
+
+            // Update the remaining records with decrypted values
+            foreach ($uniqueVolumes as $volume) {
+                try {
+                    DB::table('local_file_volumes')->where('id', $volume['id'])->update([
+                        'fs_path' => $volume['fs_path'],
+                        'mount_path' => $volume['mount_path'],
+                    ]);
+                    echo "Updated volume {$volume['id']}\n";
+                } catch (\Exception $e) {
+                    echo "Error updating volume {$volume['id']}: {$e->getMessage()}\n";
+                    Log::error("Error updating volume {$volume['id']}: ".$e->getMessage());
+                }
+            }
         }
     }