diff --git a/config/database.yml b/config/database.yml
index 77296e69..7c55d757 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -17,6 +17,7 @@ production:
   <<: *default
   adapter: <%= ENV['DB_ADAPTER'] || 'sqlite3' %>
   host: <%= ENV['DB_HOST'] %>
+  port: <%= ENV['DB_PORT' || '5432'] %>
   database: <%= ENV['DB_NAME'] || 'db/production/production.sqlite3' %>
   username: <%= ENV['DB_USERNAME'] %>
   password: <%= ENV['DB_PASSWORD'] %>
diff --git a/sample.env b/sample.env
index 057263f9..bf4f7249 100644
--- a/sample.env
+++ b/sample.env
@@ -16,11 +16,11 @@ SECRET_KEY_BASE=
 BIGBLUEBUTTON_ENDPOINT=
 BIGBLUEBUTTON_SECRET=
 
-# The hostname that the application is accessible from. 
+# The hostname that the application is accessible from.
 #
 # Used to protect against various HTTP header attacks
 # Should be in the form of "domain.com"
-# 
+#
 SAFE_HOSTS=
 
 # Google Login Provider (optional)
@@ -100,7 +100,7 @@ RECAPTCHA_SITE_KEY=
 RECAPTCHA_SECRET_KEY=
 
 # To enable Google Analytics on your site, set this key to the Google Analytics Property Tracking ID
-# 
+#
 #  https://analytics.google.com/analytics/web/
 #
 GOOGLE_ANALYTICS_TRACKING_ID=
@@ -231,6 +231,7 @@ HELP_URL=https://docs.bigbluebutton.org/greenlight/gl-overview.html
 #
 # DB_ADAPTER=postgresql
 # DB_HOST=postgres.example.com
+# DB_PORT=5432
 # DB_NAME=greenlight_production
 # DB_USERNAME=postgres
 # DB_PASSWORD=password
@@ -239,6 +240,7 @@ HELP_URL=https://docs.bigbluebutton.org/greenlight/gl-overview.html
 #
 DB_ADAPTER=postgresql
 DB_HOST=db
+DB_PORT=5432
 DB_NAME=greenlight_production
 DB_USERNAME=postgres
 DB_PASSWORD=password