diff --git a/MVMCoreUI/Templates/MoleculeListTemplate.swift b/MVMCoreUI/Templates/MoleculeListTemplate.swift
index b400f0a9..ea2913c2 100644
--- a/MVMCoreUI/Templates/MoleculeListTemplate.swift
+++ b/MVMCoreUI/Templates/MoleculeListTemplate.swift
@@ -126,7 +126,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController {
     open override func addMolecules(_ molecules: [[AnyHashable : Any]], sender: UITableViewCell, animation: UITableView.RowAnimation) {
         // This dispatch is needed to fix a race condition that can occur if this function is called during the table setup.
         DispatchQueue.main.async {
-            guard let cell = sender as? MoleculeTableViewCell, let indexPath = self.tableView?.indexPath(for: cell) else { return }
+            guard let indexPath = self.tableView?.indexPath(for: sender) else { return }
             var indexPaths: [IndexPath] = []
             for molecule in molecules {
                 if let info = self.getMoleculeInfo(with: molecule) {