diff --git a/app/Models/Service.php b/app/Models/Service.php
index c345b2b8b..36d7aa9c3 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -841,7 +841,12 @@ public function saveComposeConfigs()
         $json = Yaml::parse($this->docker_compose);
         $envs_from_coolify = $this->environment_variables()->get();
         foreach ($json['services'] as $service => $config) {
-            $envs = collect($config['environment']);
+            if (data_get($config, 'environment') === null) {
+                data_set($json, "services.$service.environment", []);
+                $envs = collect([]);
+            } else {
+                $envs = collect($config['environment']);
+            }
             $envs->put('COOLIFY_CONTAINER_NAME', "$service-{$this->uuid}");
             foreach ($envs_from_coolify as $env) {
                 $envs = $envs->map(function ($value) use ($env) {