diff --git a/config/defaults.yml b/config/defaults.yml
index 9c404c99cd9..c8f8cfd43d8 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -36,7 +36,6 @@ defaults:
     rails_environment: 'development'
     stderr_log:
     stdout_log:
-    database: 'mysql'
     unicorn_worker: 2
     unicorn_timeout: 90
     embed_sidekiq_worker: false
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index 17564e45180..6b34c472f2f 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -148,10 +148,6 @@ configuration: ## Section
     #stderr_log: '/usr/local/app/diaspora/log/unicorn-stderr.log'
     #stdout_log: '/usr/local/app/diaspora/log/unicorn-stdout.log'
     
-    ## The database type the server should use by default.
-    ## Valid choices are 'mysql' and 'postgres'
-    #database: 'mysql'
-    
     ## Number of Unicorn worker processes, increase this if
     ## you have many users
     #unicorn_worker: 2
diff --git a/script/server b/script/server
index 2c93e6b0c83..9b079d0a98b 100755
--- a/script/server
+++ b/script/server
@@ -73,7 +73,6 @@ fi
 os=$(uname -s)
 vars=$(bundle exec ruby ./script/get_config.rb \
   port=server.port \
-  db=server.database \
   single_process_mode=environment.single_process_mode? \
   embed_sidekiq_worker=server.embed_sidekiq_worker \
   workers=server.sidekiq_workers
@@ -81,9 +80,8 @@ vars=$(bundle exec ruby ./script/get_config.rb \
 on_failure "Couldn't parse config/diaspora.yml!"
 eval "$vars"
 
-if [ -z "$DB" ]
+if [ -n "$DB" ]
 then
-  DB=$db
   export DB
 fi