diff --git a/app/config/app.php b/app/config/app.php
index 3680bdb4..e671e6c8 100644
--- a/app/config/app.php
+++ b/app/config/app.php
@@ -145,6 +145,7 @@ return [
         'CachetHQ\Cachet\Providers\RepositoryServiceProvider',
         'CachetHQ\Cachet\Providers\RoutingServiceProvider',
         'CachetHQ\Cachet\Providers\ViewComposerServiceProvider',
+        'CachetHQ\Cachet\Providers\LoadConfigServiceProvider',
 
     ],
 
diff --git a/src/Http/Before/LoadConfigFilter.php b/src/Providers/LoadConfigServiceProvider.php
similarity index 60%
rename from src/Http/Before/LoadConfigFilter.php
rename to src/Providers/LoadConfigServiceProvider.php
index 6d0dca92..d39b5396 100644
--- a/src/Http/Before/LoadConfigFilter.php
+++ b/src/Providers/LoadConfigServiceProvider.php
@@ -1,24 +1,23 @@
 <?php
 
-namespace CachetHQ\Cachet\Http\Before;
+namespace CachetHQ\Cachet\Providers;
 
 use CachetHQ\Cachet\Models\Setting;
-use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\ServiceProvider;
 
-class LoadConfigFilter
+class LoadConfigServiceProvider extends ServiceProvider
 {
     /**
-     * Load confit to override values filter.
+     * Boot the service provider.
      *
-     * @param \Illuminate\Http\Request $request
-     *
-     * @return null
+     * @return void
      */
-    public function filter(Request $request)
+    public function boot()
     {
-        // Always allow our own domain.
+        //
         $appDomain = Setting::get('app_domain');
         $appTimezone = Setting::get('app_timezone');
         $appLocale = Setting::get('app_locale');
@@ -28,4 +27,14 @@ class LoadConfigFilter
         Config::set('app.locale', $appLocale ?: Config::get('app.locale'));
         Lang::setLocale($appLocale);
     }
+
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
 }
diff --git a/src/Providers/RoutingServiceProvider.php b/src/Providers/RoutingServiceProvider.php
index 27bc55f0..7b55e1cd 100644
--- a/src/Providers/RoutingServiceProvider.php
+++ b/src/Providers/RoutingServiceProvider.php
@@ -41,7 +41,6 @@ class RoutingServiceProvider extends ServiceProvider
         $this->app->router->filter('csrf', 'CachetHQ\Cachet\Http\Before\CsrfFilter');
 
         // Cachet's before filters
-        $this->app->router->before('CachetHQ\Cachet\Http\Before\LoadConfigFilter');
         $this->app->router->filter('is_setup', 'CachetHQ\Cachet\Http\Before\IsSetupFilter');
         $this->app->router->filter('has_setting', 'CachetHQ\Cachet\Http\Before\HasSettingFilter');
         $this->app->router->filter('login_throttling', 'CachetHQ\Cachet\Http\Before\LoginThrottlingFilter');