diff --git a/app/Console/Commands/FinishUpdate.php b/app/Console/Commands/FinishUpdate.php
index 0635dea21..93dd42e33 100644
--- a/app/Console/Commands/FinishUpdate.php
+++ b/app/Console/Commands/FinishUpdate.php
@@ -47,19 +47,17 @@ class FinishUpdate extends Command
             throw new \Exception(trans('modules.errors.finish', ['module' => $alias]));
         }
 
-        if ($alias != 'core') {
-            $company = company($company_id);
+        $company = company($company_id);
 
-            if (empty($company)) {
-                return;
-            }
+        if (empty($company)) {
+            return;
+        }
 
-            $company->makeCurrent();
+        $company->makeCurrent();
 
-            // Set locale for modules
-            if (empty($company->locale)) {
-                app()->setLocale($company->locale);
-            }
+        // Set locale for modules
+        if (($alias != 'core') && !empty($company->locale)) {
+            app()->setLocale($company->locale);
         }
 
         // Disable model cache during update