diff --git a/app/controllers/form_field_values_controller.rb b/app/controllers/form_field_values_controller.rb
index 4b4f577e7..5bbeffd08 100644
--- a/app/controllers/form_field_values_controller.rb
+++ b/app/controllers/form_field_values_controller.rb
@@ -52,7 +52,7 @@ class FormFieldValuesController < ApplicationController
     smart_annotation_notification(
       old_text: @form_field_value.text_previously_was,
       new_text: @form_field_value.text,
-      subject: step.protocol,
+      subject: step,
       title: t('notifications.form_field_value_title',
                user: current_user.full_name,
                field: @form_field_value.form_field.name,
diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb
index 1366d2331..bb9aabde5 100644
--- a/app/controllers/repository_rows_controller.rb
+++ b/app/controllers/repository_rows_controller.rb
@@ -213,6 +213,8 @@ class RepositoryRowsController < ApplicationController
                      { repository_row: @repository_row.id,
                        repository_column: update_params['repository_cells']&.keys&.first ||
                        I18n.t('repositories.table.row_name') })
+
+        record_annotation_notification(@repository_row, row_cell_update.cell) if row_cell_update.cell.value_type == 'RepositoryTextValue'
       end
       @reminders_present = @repository_row.repository_cells.with_active_reminder(@current_user).any?
 
diff --git a/app/helpers/comment_helper.rb b/app/helpers/comment_helper.rb
index 81aa82646..ba6dc2566 100644
--- a/app/helpers/comment_helper.rb
+++ b/app/helpers/comment_helper.rb
@@ -162,7 +162,7 @@ module CommentHelper
     smart_annotation_notification(
       old_text: old_text,
       new_text: comment.message,
-      subject: step.protocol,
+      subject: step,
       title: t('notifications.step_comment_annotation_title',
                step: step.name,
                user: current_user.full_name),