diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 4b0acc9d8803cd10a5bbbaeeecc37e30b3dad301..d425c9db6c8808f31f3213156ad8732789ff4245 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -41,7 +41,7 @@ def start
         abort opt.to_s unless (0..1).include?(ARGV.size)
       end
 
-      unless config = YAML::load(ERB.new(IO.read("#{@app.root}/config/database.yml")).result)[Rails.env]
+      unless config = @app.config.database_configuration[Rails.env]
         abort "No database is configured for the environment '#{Rails.env}'"
       end