diff --git a/app/Http/Middleware/RedirectToSetup.php b/app/Http/Middleware/RedirectToSetup.php
index 8b610232..e5b0cce8 100644
--- a/app/Http/Middleware/RedirectToSetup.php
+++ b/app/Http/Middleware/RedirectToSetup.php
@@ -11,7 +11,15 @@ class RedirectToSetup
     public function handle($request, Closure $next)
     {
         $version = config('app.version');
-        if (! $request->is('setup*') && Comparator::greaterThan($version, option('version', $version))) {
+        $hasLock = resolve(Filesystem::class)->exists(storage_path('install.lock'));
+
+        // If lock isn't existed, it means that BS isn't installed.
+        // Database is unavailable at this time, so we should disable the loader.
+        if (! $hasLock) {
+            config(['translation-loader.translation_loaders' => []]);
+        }
+
+        if ($hasLock && ! $request->is('setup*') && Comparator::greaterThan($version, option('version', $version))) {
             $user = $request->user();
             if ($user && $user->isAdmin()) {
                 return redirect('/setup/update');
@@ -20,7 +28,6 @@ class RedirectToSetup
             }
         }
 
-        $hasLock = resolve(Filesystem::class)->exists(storage_path('install.lock'));
         if ($hasLock || $request->is('setup*')) {
             return $next($request);
         }
diff --git a/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php b/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php
index 7a5baebf..9dce4ca0 100644
--- a/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php
+++ b/tests/HttpTest/MiddlewareTest/RedirectToSetupTest.php
@@ -32,5 +32,6 @@ class RedirectToSetupTest extends TestCase
         $this->get('/')->assertViewIs('home');
         $this->get('/setup')->assertViewIs('setup.wizard.welcome');
         $this->get('/')->assertRedirect('/setup');
+        $this->assertEquals([], config('translation-loader.translation_loaders'));
     }
 }