diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index af0c90814..dc0a15a85 100644
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -62,8 +62,6 @@ jobs:
         rm -rf enterprise
         rm -rf spec/enterprise
 
-    - uses: mxschmitt/action-tmate@v3
-
     - name: Create database
       run: bundle exec rake db:create
 
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index e2eb5b9bd..adebaf03b 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -2,7 +2,7 @@ class ApplicationRecord < ActiveRecord::Base
   include Events::Types
   self.abstract_class = true
 
-  # connects_to database: { writing: :primary, reading: :primary_replica }
+  connects_to database: { writing: :primary, reading: :primary_replica }
 
   before_validation :validates_column_content_length
 
diff --git a/config/database.yml b/config/database.yml
index ebdd769d2..296930e9c 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -29,8 +29,8 @@ production:
     password: "<%= ENV.fetch('POSTGRES_PASSWORD', 'chatwoot_prod') %>"
   primary_replica:
     <<: *default
-    host: "<%= ENV.fetch('POSTGRES_HOST_RR', 'localhost') %>"
-    database: "<%= ENV.fetch('POSTGRES_DATABASE', 'chatwoot_production') %>"
-    username: "<%= ENV.fetch('POSTGRES_USERNAME_RR', 'chatwoot_prod_readonly') %>"
-    password: "<%= ENV.fetch('POSTGRES_PASSWORD_RR', 'chatwoot_prod') %>"
+    host: "<%= ENV.fetch('POSTGRES_HOST_RR', nil) %>"
+    database: "<%= ENV.fetch('POSTGRES_DATABASE', nil) %>"
+    username: "<%= ENV.fetch('POSTGRES_USERNAME_RR', nil) %>"
+    password: "<%= ENV.fetch('POSTGRES_PASSWORD_RR', nil) %>"
     replica: true
diff --git a/config/initializers/database_fallback.rb b/config/initializers/database_fallback.rb
deleted file mode 100644
index 624f98ab8..000000000
--- a/config/initializers/database_fallback.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'active_record'
-
-replica_available = ActiveRecord::Base.connection_pool.with_connection do |conn|
-  conn.execute('SELECT 1 FROM primary_replica LIMIT 1')
-  true
-rescue StandardError
-  false
-end
-
-Rails.application.config.to_prepare do
-  ApplicationRecord.connects_to database: {
-    writing: :primary,
-    reading: replica_available ? :primary_replica : :primary
-  }
-end