diff --git a/Signal/src/ViewControllers/EditHistoryTableSheetViewController.swift b/Signal/src/ViewControllers/EditHistoryTableSheetViewController.swift
index e29a73fc067..6c8f115d40a 100644
--- a/Signal/src/ViewControllers/EditHistoryTableSheetViewController.swift
+++ b/Signal/src/ViewControllers/EditHistoryTableSheetViewController.swift
@@ -189,8 +189,8 @@ class EditHistoryTableSheetViewController: OWSTableSheetViewController {
     @objc
     func didTapCell(_ recognizer: UITapGestureRecognizer) {
         guard
-            let index = recognizer.view?.tag,
-            let item = renderItems[safe: index],
+            let view = recognizer.view as? CVCellView,
+            let item = view.renderItem,
             item.itemModel.componentState.displayableBodyText?.isTextTruncated == true
         else {
             return