diff --git a/app/Models/LookupModel.php b/app/Models/LookupModel.php
index 9ddc4868aa6e..7156e2afe749 100644
--- a/app/Models/LookupModel.php
+++ b/app/Models/LookupModel.php
@@ -93,8 +93,12 @@ class LookupModel extends Eloquent
         }
     }
 
-    public static function setDbServer($server, $isUser = false)
+    protected static function setDbServer($server, $isUser = false)
     {
+        if (! env('MULTI_DB_ENABLED')) {
+            return;
+        }
+
         config(['database.default' => $server]);
 
         if ($isUser) {
diff --git a/config/database.php b/config/database.php
index f8ec008932f4..e5f0330b2d44 100644
--- a/config/database.php
+++ b/config/database.php
@@ -46,12 +46,7 @@ return [
 
     'connections' => [
 
-        'sqlite' => [
-            'driver'   => 'sqlite',
-            'database' => storage_path().'/database.sqlite',
-            'prefix'   => '',
-        ],
-
+        // single database setup
         'mysql' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST', 'localhost'),
@@ -65,6 +60,7 @@ return [
             'engine'    => 'InnoDB',
         ],
 
+        // multi-database setup
         'db-ninja-0' => [
             'driver'    => 'mysql',
             'host'      => env('DB_HOST', env('DB_HOST0', 'localhost')),
@@ -104,26 +100,6 @@ return [
             'engine'    => 'InnoDB',
         ],
 
-        'pgsql' => [
-            'driver'   => 'pgsql',
-            'host'     => env('DB_HOST', 'localhost'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'charset'  => 'utf8',
-            'prefix'   => '',
-            'schema'   => 'public',
-        ],
-
-        'sqlsrv' => [
-            'driver'   => 'sqlsrv',
-            'host'     => env('DB_HOST', 'localhost'),
-            'database' => env('DB_DATABASE', 'forge'),
-            'username' => env('DB_USERNAME', 'forge'),
-            'password' => env('DB_PASSWORD', ''),
-            'prefix'   => '',
-        ],
-
     ],
 
     /*
diff --git a/database/migrations/2017_04_30_174702_add_multiple_database_support.php b/database/migrations/2017_04_30_174702_add_multiple_database_support.php
index d8bdfb136269..60f2ece903f1 100644
--- a/database/migrations/2017_04_30_174702_add_multiple_database_support.php
+++ b/database/migrations/2017_04_30_174702_add_multiple_database_support.php
@@ -49,12 +49,6 @@ class AddMultipleDatabaseSupport extends Migration
 
         Schema::rename('lookup_tokens', 'lookup_account_tokens');
 
-        DB::table('db_servers')->insert(
-            ['name' => 'db-ninja-1']
-        );
-        DB::table('db_servers')->insert(
-            ['name' => 'db-ninja-2']
-        );
     }
 
     /**
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 0d384ceb6889..11803e0c9873 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -29,5 +29,6 @@ class DatabaseSeeder extends Seeder
         $this->call('LanguageSeeder');
         $this->call('IndustrySeeder');
         $this->call('FrequencySeeder');
+        $this->call('DbServerSeeder');
     }
 }
diff --git a/database/seeds/UpdateSeeder.php b/database/seeds/UpdateSeeder.php
index 0d494cdfc688..a3326484ed35 100644
--- a/database/seeds/UpdateSeeder.php
+++ b/database/seeds/UpdateSeeder.php
@@ -25,7 +25,8 @@ class UpdateSeeder extends Seeder
         $this->call('LanguageSeeder');
         $this->call('IndustrySeeder');
         $this->call('FrequencySeeder');
-        
+        $this->call('DbServerSeeder');
+
         Cache::flush();
     }
 }