diff --git a/pkg/lockservice/txn.go b/pkg/lockservice/txn.go
index 7ba9b16aec09..24b975644719 100644
--- a/pkg/lockservice/txn.go
+++ b/pkg/lockservice/txn.go
@@ -162,7 +162,6 @@ func (txn *activeTxn) close(
 				table,
 				cs)
 			cs.close()
-			delete(txn.holdLocks, table)
 		}
 	}
 
@@ -175,10 +174,12 @@ func (txn *activeTxn) close(
 				table,
 				cs)
 			cs.close()
-			delete(txn.holdLocks, table)
 		}
 	}
 
+	for table := range txn.holdLocks {
+		delete(txn.holdLocks, table)
+	}
 	txn.txnID = nil
 	txn.txnKey = ""
 	txn.blockedWaiters = txn.blockedWaiters[:0]