diff --git a/CHANGELOG b/CHANGELOG
index 350be45627f078fa9a92bd9dfbed1c2a08141b9a..2fa5299acf6794938ea67adc27f5c3f3efcc1b56 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -75,6 +75,7 @@ v 8.7.0 (unreleased)
   - Fix repository cache invalidation issue when project is recreated with an empty repo (Stan Hu)
   - Fix: Allow empty recipients list for builds emails service when pushed is added (Frank Groeneveld)
   - Improved markdown forms
+  - Show JavaScript errors in sentry
   - Delete tags using Rugged for performance reasons (Robert Schilling)
   - Diffs load at the correct point when linking from from number
   - Selected diff rows highlight
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index d4c399f7be23f66f26243067909713624372ac14..83d52cabcdad2f5328026dbf4d65613a6f670315 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -299,6 +299,7 @@ $ ->
 
   if gon.sentry_dsn?
     Raven.config(gon.sentry_dsn, {
+      includePaths: [/gon.relative_url_root/]
       ignoreErrors: [
         # Random plugins/extensions
         'top.GLOBALS',
@@ -336,6 +337,5 @@ $ ->
 
   if gon.current_user_id
     Raven.setUserContext({
-      api_token: gon.api_token,
       id: gon.current_user_id
     })
\ No newline at end of file