diff --git a/app/models/concerns/trackable.rb b/app/models/concerns/trackable.rb
index 646560fd7e82145f1c0a09910d43e839abc35370..4da704bf74b767eec43d45afab93bb1455f59e42 100644
--- a/app/models/concerns/trackable.rb
+++ b/app/models/concerns/trackable.rb
@@ -3,6 +3,7 @@ module Trackable
   include PublicActivity::Model
 
   included do
-    tracked owner: proc { |controller, _model| controller.try(:current_user) }
+    tracked owner: proc { |controller, _model|
+      _model.try(:user) || _model.try(:owner) || controller.try(:current_user) }
   end
 end