diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 55cb96f0..23d119f1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -22,9 +22,11 @@ class ApplicationController < ActionController::Base
   end
 
   def set_sentry_context
-    ::Mnemosyne::Instrumenter.current_trace.meta['session_id'] = session[:session_id]
-    ::Mnemosyne::Instrumenter.current_trace.meta['csrf_token'] = session[:_csrf_token]
-    ::Mnemosyne::Instrumenter.current_trace.meta['external_user_id'] = session[:external_user_id]
+    if ::Mnemosyne::Instrumenter.current_trace.present?
+      ::Mnemosyne::Instrumenter.current_trace.meta['session_id'] = session[:session_id]
+      ::Mnemosyne::Instrumenter.current_trace.meta['csrf_token'] = session[:_csrf_token]
+      ::Mnemosyne::Instrumenter.current_trace.meta['external_user_id'] = session[:external_user_id]
+    end
 
     return if current_user.blank?