diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php
index 3d33720a8979..c15382750178 100644
--- a/app/Http/Middleware/StartupCheck.php
+++ b/app/Http/Middleware/StartupCheck.php
@@ -60,8 +60,15 @@ class StartupCheck
             abort(403);
         }
 
-        // Check if a new version was installed
-        if (! Utils::isNinja()) {
+        if (Utils::isSelfHost()) {
+            // Check if config:cache may have been run
+            if (! env('APP_URL')) {
+                echo "<p>There appears to be a problem with your configuration, please check your .env file.</p>" .
+                     "<p>If you've run 'php artisan config:cache' you will need to run 'php artisan config:clear'</p>.";
+                exit;
+            }
+
+            // Check if a new version was installed
             $file = storage_path() . '/version.txt';
             $version = @file_get_contents($file);
             if ($version != NINJA_VERSION) {