diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 99281b1cf..bc244a8b9 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1955,12 +1955,8 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
             $resource->docker_compose_raw = Yaml::dump($yaml, 10, 2);
             $resource->docker_compose = Yaml::dump($finalServices, 10, 2);
         }
-        if ($resource->environment_variables()->count() === 0) {
-            data_forget($resource, 'environment_variables');
-        }
-        if ($resource->environment_variables_preview()->count() === 0) {
-            data_forget($resource, 'environment_variables_preview');
-        }
+        data_forget($resource, 'environment_variables');
+        data_forget($resource, 'environment_variables_preview');
         $resource->save();
 
         return collect($finalServices);