diff --git a/book/src/specs/kimchi.md b/book/src/specs/kimchi.md
index d84af63172..7559baa739 100644
--- a/book/src/specs/kimchi.md
+++ b/book/src/specs/kimchi.md
@@ -2202,7 +2202,7 @@ The prover then follows the following steps to create the proof:
 	* $s_i$
 	* $w_i$
 	* $z$
-	* lookup (TODO)
+	* lookup (TODO, see [this issue](https://github.com/MinaProtocol/mina/issues/13886))
 	* generic selector
 	* poseidon selector
 
diff --git a/kimchi/src/circuits/gate.rs b/kimchi/src/circuits/gate.rs
index 212bddbbbf..61be85900d 100644
--- a/kimchi/src/circuits/gate.rs
+++ b/kimchi/src/circuits/gate.rs
@@ -211,6 +211,7 @@ impl<F: PrimeField + SquareRootField> CircuitGate<F> {
             EndoMul => self.verify_endomul::<G>(row, witness, &index.cs),
             EndoMulScalar => self.verify_endomul_scalar::<G>(row, witness, &index.cs),
             // TODO: implement the verification for the lookup gate
+            // See https://github.com/MinaProtocol/mina/issues/14011
             Lookup => Ok(()),
             CairoClaim | CairoInstruction | CairoFlags | CairoTransition => {
                 self.verify_cairo_gate::<G>(row, witness, &index.cs)
@@ -299,6 +300,7 @@ impl<F: PrimeField + SquareRootField> CircuitGate<F> {
             }
             GateType::Lookup => {
                 // TODO: implement the verification for the lookup gate
+                // See https://github.com/MinaProtocol/mina/issues/14011
                 vec![]
             }
             GateType::CairoClaim => turshi::Claim::constraint_checks(&env, &mut cache),
diff --git a/kimchi/src/circuits/lookup/lookups.rs b/kimchi/src/circuits/lookup/lookups.rs
index 12e4bd058d..63266b3abf 100644
--- a/kimchi/src/circuits/lookup/lookups.rs
+++ b/kimchi/src/circuits/lookup/lookups.rs
@@ -323,7 +323,6 @@ pub type JointLookupSpec<F> = JointLookup<SingleLookup<F>, LookupTableID>;
 pub type JointLookupValue<F> = JointLookup<F, F>;
 
 impl<F: Zero + One + Clone + Neg<Output = F> + From<u64>> JointLookupValue<F> {
-    // TODO: Support multiple tables
     /// Evaluate the combined value of a joint-lookup.
     pub fn evaluate(&self, joint_combiner: &F, table_id_combiner: &F) -> F {
         combine_table_entry(
diff --git a/kimchi/src/prover.rs b/kimchi/src/prover.rs
index 44c6571765..0f92745d7f 100644
--- a/kimchi/src/prover.rs
+++ b/kimchi/src/prover.rs
@@ -936,7 +936,7 @@ where
         //~~ * $s_i$
         //~~ * $w_i$
         //~~ * $z$
-        //~~ * lookup (TODO)
+        //~~ * lookup (TODO, see [this issue](https://github.com/MinaProtocol/mina/issues/13886))
         //~~ * generic selector
         //~~ * poseidon selector
         //~