diff --git a/app/Models/Application.php b/app/Models/Application.php
index 306c9bd7a..c2ba6e773 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -188,13 +188,16 @@ protected static function booted()
 
                     // Remove SERVICE_FQDN_* and SERVICE_URL_* environment variables
                     $application->environment_variables()
-                        ->where('key', 'LIKE', 'SERVICE_FQDN_%')
-                        ->orWhere('key', 'LIKE', 'SERVICE_URL_%')
+                        ->where(function ($q) {
+                            $q->where('key', 'LIKE', 'SERVICE_FQDN_%')
+                                ->orWhere('key', 'LIKE', 'SERVICE_URL_%');
+                        })
                         ->delete();
-
                     $application->environment_variables_preview()
-                        ->where('key', 'LIKE', 'SERVICE_FQDN_%')
-                        ->orWhere('key', 'LIKE', 'SERVICE_URL_%')
+                        ->where(function ($q) {
+                            $q->where('key', 'LIKE', 'SERVICE_FQDN_%')
+                                ->orWhere('key', 'LIKE', 'SERVICE_URL_%');
+                        })
                         ->delete();
                 }