diff --git a/app/models/request_issue.rb b/app/models/request_issue.rb
index 3f9b9f41dd2..11744387a14 100644
--- a/app/models/request_issue.rb
+++ b/app/models/request_issue.rb
@@ -449,7 +449,7 @@ def fetch_request_issues_updates
 
   def fetch_removed_by_user
     if removed?
-      relevant_update = request_issues_updates.find do |update|
+      relevant_update = request_issues_updates&.find do |update|
         update.removed_issues.any? { |issue| issue.id == id }
       end
 
diff --git a/app/models/request_issues_update_event.rb b/app/models/request_issues_update_event.rb
index 07cf49d989e..3656fae8ed2 100644
--- a/app/models/request_issues_update_event.rb
+++ b/app/models/request_issues_update_event.rb
@@ -196,7 +196,7 @@ def process_legacy_issues_for_ineligible_to_eligible!(request_issue, parser_issu
   end
 
   def reset_or_create_legacy_issue!(legacy_issue, request_issue)
-    if legacy_issue && optin?(@review) && request_issue.ineligible_reason.blank?
+    if legacy_issue && optin? && request_issue.ineligible_reason.blank?
       legacy_issue.legacy_issue_optin.update!(
         optin_processed_at: nil,
         rollback_processed_at: nil,
@@ -206,7 +206,7 @@ def reset_or_create_legacy_issue!(legacy_issue, request_issue)
       legacy_issue = create_legacy_issue_backfill(request_issue)
 
       # LegacyIssueOptin
-      if optin?(@review) && request_issue.ineligible_reason.blank?
+      if optin? && request_issue.ineligible_reason.blank?
         create_legacy_optin_backfill(request_issue, legacy_issue)
       end
     end
@@ -323,7 +323,7 @@ def create_request_issue_backfill
         legacy_issue = create_legacy_issue_backfill(ri)
 
         # LegacyIssueOptin
-        if optin?(@review) && ri.ineligible_reason.blank?
+        if optin? && ri.ineligible_reason.blank?
           create_legacy_optin_backfill(ri, legacy_issue)
         end
       end
@@ -337,8 +337,8 @@ def vacols_ids_exist?(request_issue)
     request_issue.vacols_id.present? && request_issue.vacols_sequence_id.present?
   end
 
-  def optin?(decision_review)
-    decision_review.legacy_opt_in_approved?
+  def optin?
+    ActiveModel::Type::Boolean.new.cast(@parser.claim_review_legacy_opt_in_approved)
   end
 
   def create_legacy_issue_backfill(request_issue)