diff --git a/app/views/components/events/table_component.rb b/app/views/components/events/table_component.rb
index fe3fe5fb8a3..fcd96ee8105 100644
--- a/app/views/components/events/table_component.rb
+++ b/app/views/components/events/table_component.rb
@@ -94,7 +94,7 @@ def additional_info(event)
 
   def show_additional_info?(event)
     return true if event.has_attribute?(:user_id) && event.user == current_user
-    return true if event.additional.has_attribute?("actor_gid") && event.additional.actor_gid == current_user.to_gid
+    return true if event.additional.has_attribute?("actor_gid") && event.additional.actor_gid == current_user&.to_gid
 
     false
   end
diff --git a/test/components/preview_test.rb b/test/components/preview_test.rb
index 8f3e7df186c..c7c7de455d6 100644
--- a/test/components/preview_test.rb
+++ b/test/components/preview_test.rb
@@ -1,6 +1,15 @@
 require "test_helper"
 
 class PreviewTest < ComponentTest
+  attr_reader :current_user
+
+  def view_context
+    super.tap do |view_context|
+      test_case = self
+      view_context.singleton_class.define_method(:current_user) { test_case.current_user }
+    end
+  end
+
   test "all previews render" do
     capture_io { Rails.application.load_seed }