diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 7104013f..ee7a00a0 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -121,6 +121,15 @@ module Travis::Api
         Travis::Database.connect
 
         if Travis.env == 'production' || Travis.env == 'staging'
+          # Octopus checks for Rails.env, just hardcode enabled?
+          Octopus.instance_eval do
+            def enabled?
+              true
+            end
+          end
+
+          ActiveRecord::Base.custom_octopus_connection = false
+
           ::Octopus.setup do |config|
             config.shards = { :follower => Travis.config.database_follower }
             config.environments = ['production', 'staging']