diff --git a/app/Livewire/Project/Shared/EnvironmentVariable/All.php b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
index f867aaf3d..12a4cae79 100644
--- a/app/Livewire/Project/Shared/EnvironmentVariable/All.php
+++ b/app/Livewire/Project/Shared/EnvironmentVariable/All.php
@@ -193,8 +193,8 @@ private function handleBulkSubmit()
             }
         }
 
-        // Always show success message unless an error occurred
-        if (! $errorOccurred) {
+        // Only show success message if changes were actually made and no errors occurred
+        if ($changesMade && ! $errorOccurred) {
             $this->dispatch('success', 'Environment variables updated.');
         }
     }
diff --git a/tests/Feature/EnvironmentVariableCommentTest.php b/tests/Feature/EnvironmentVariableCommentTest.php
index 8b02ad8bf..e7f9a07fb 100644
--- a/tests/Feature/EnvironmentVariableCommentTest.php
+++ b/tests/Feature/EnvironmentVariableCommentTest.php
@@ -166,8 +166,8 @@
         'resource' => $this->application,
         'type' => 'application',
     ])
-        ->set('variablesInput', $bulkContent)
-        ->call('saveVariables');
+        ->set('variables', $bulkContent)
+        ->call('submit');
 
     // Refresh the environment variable
     $env->refresh();
@@ -196,8 +196,8 @@
         'resource' => $this->application,
         'type' => 'application',
     ])
-        ->set('variablesInput', $bulkContent)
-        ->call('saveVariables');
+        ->set('variables', $bulkContent)
+        ->call('submit');
 
     // Refresh the environment variable
     $env->refresh();
@@ -234,8 +234,8 @@
         'resource' => $this->application,
         'type' => 'application',
     ])
-        ->set('variablesInput', $bulkContent)
-        ->call('saveVariables');
+        ->set('variables', $bulkContent)
+        ->call('submit');
 
     // Refresh both variables
     $env1->refresh();
@@ -258,8 +258,8 @@
         'resource' => $this->application,
         'type' => 'application',
     ])
-        ->set('variablesInput', $bulkContent)
-        ->call('saveVariables');
+        ->set('variables', $bulkContent)
+        ->call('submit');
 
     // Check that variables were created with correct comments
     $var1 = EnvironmentVariable::where('key', 'NEW_VAR1')