diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 71d3d971381c..f4cd6e23d864 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -36,8 +36,13 @@ class StartupCheck
         // Set up trusted X-Forwarded-Proto proxies
         // TRUSTED_PROXIES accepts a comma delimited list of subnets
         // ie, TRUSTED_PROXIES='10.0.0.0/8,172.16.0.0/12,192.168.0.0/16'
+        // set TRUSTED_PROXIES=* if you want to trust every proxy.
         if (isset($_ENV['TRUSTED_PROXIES'])) {
-            $request->setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES'))));
+            if (env('TRUSTED_PROXIES') == '*') {
+                $request->setTrustedProxies(['127.0.0.1', $request->server->get('REMOTE_ADDR')]);
+            } else{
+                $request->setTrustedProxies(array_map('trim', explode(',', env('TRUSTED_PROXIES'))));
+            }
         }
 
         // Ensure all request are over HTTPS in production