diff --git a/src/Illuminate/Http/Middleware/TrustProxies.php b/src/Illuminate/Http/Middleware/TrustProxies.php
index e7e526374fae..7f7e9766b5f7 100644
--- a/src/Illuminate/Http/Middleware/TrustProxies.php
+++ b/src/Illuminate/Http/Middleware/TrustProxies.php
@@ -68,15 +68,16 @@ protected function setTrustedProxyIpAddresses(Request $request)
     {
         $trustedIps = $this->proxies() ?: config('trustedproxy.proxies');
 
-        if (is_null($trustedIps) &&
-            (laravel_cloud() ||
-             str_ends_with($request->host(), '.on-forge.com') ||
-             str_ends_with($request->host(), '.on-vapor.com'))) {
+        $host = $request->host();
+
+        $isForgeOrVapor = str_ends_with($host, '.on-forge.com') ||
+            str_ends_with($host, '.on-vapor.com');
+
+        if (is_null($trustedIps) && (laravel_cloud() || $isForgeOrVapor)) {
             $trustedIps = '*';
         }
 
-        if (str_ends_with($request->host(), '.on-forge.com') ||
-            str_ends_with($request->host(), '.on-vapor.com')) {
+        if ($isForgeOrVapor) {
             $request->headers->remove('X-Forwarded-Host');
         }