diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 3cd6de53..c490e4a0 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -87,8 +87,8 @@ module Travis::Api
           [ 420, {}, ['Enhance Your Calm']]
         end
 
-        use Travis::Api::App::Cors
-        use Raven::Rack if Endpoint.production?
+        use Travis::Api::App::Cors # if Travis.env == 'development' ???
+        use Raven::Rack if Endpoint.production? && Travis.config.sentry.dsn
         use Rack::Protection::PathTraversal
         use Rack::SSL if Endpoint.production?
         use ActiveRecord::ConnectionAdapters::ConnectionManagement