diff --git a/app/Livewire/SharedVariables/Environment/Show.php b/app/Livewire/SharedVariables/Environment/Show.php
index 6b1d35d14..328986cea 100644
--- a/app/Livewire/SharedVariables/Environment/Show.php
+++ b/app/Livewire/SharedVariables/Environment/Show.php
@@ -99,10 +99,9 @@ public function submit()
     private function handleBulkSubmit()
     {
         $variables = parseEnvFormatToArray($this->variables);
+        $changesMade = false;
 
-        DB::transaction(function () use ($variables) {
-            $changesMade = false;
-
+        DB::transaction(function () use ($variables, &$changesMade) {
             // Delete removed variables
             $deletedCount = $this->deleteRemovedVariables($variables);
             if ($deletedCount > 0) {
@@ -114,11 +113,12 @@ private function handleBulkSubmit()
             if ($updatedCount > 0) {
                 $changesMade = true;
             }
-
-            if ($changesMade) {
-                $this->dispatch('success', 'Environment variables updated.');
-            }
         });
+
+        // Only dispatch success after transaction has committed
+        if ($changesMade) {
+            $this->dispatch('success', 'Environment variables updated.');
+        }
     }
 
     private function deleteRemovedVariables($variables)