diff --git a/app/Models/Application.php b/app/Models/Application.php
index 72d2be60f..d9d6c8a3a 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -20,6 +20,8 @@ class Application extends BaseModel
         static::deleting(function ($application) {
             $application->settings()->delete();
             $application->persistentStorages()->delete();
+            $application->environment_variables()->delete();
+            $application->environment_variables_preview()->delete();
         });
     }
 
diff --git a/app/Models/StandalonePostgresql.php b/app/Models/StandalonePostgresql.php
index e0b95c5db..afc5cdc91 100644
--- a/app/Models/StandalonePostgresql.php
+++ b/app/Models/StandalonePostgresql.php
@@ -32,6 +32,7 @@ class StandalonePostgresql extends BaseModel
             $database->scheduledBackups()->delete();
             $database->persistentStorages()->delete();
             instant_remote_process(['docker volume rm postgres-data-' . $database->uuid], $database->destination->server, false);
+            $database->environment_variables()->delete();
         });
     }