diff --git a/lib/activity_notification/roles/acts_as_notifiable.rb b/lib/activity_notification/roles/acts_as_notifiable.rb
index 0e2fb45b..7955113a 100644
--- a/lib/activity_notification/roles/acts_as_notifiable.rb
+++ b/lib/activity_notification/roles/acts_as_notifiable.rb
@@ -278,14 +278,7 @@ def add_tracked_callbacks(target_type, tracked_option = {})
       # @param [Symbol]        tracked_action    Tracked action (:create or :update)
       # @param [Proc]          tracked_proc      Proc or lambda function to execute
       def add_tracked_callback(tracked_callbacks, tracked_action, tracked_proc)
-        if tracked_callbacks.include? tracked_action
-          case tracked_action
-          when :create
-            after_create tracked_proc
-          when :update
-            after_update tracked_proc
-          end
-        end
+        after_commit(tracked_proc, on: tracked_action) if tracked_callbacks.include? tracked_action
       end
 
       # Adds destroy dependency.