diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
index 227efbce43..8ae40f8c12 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/Hub.java
@@ -436,6 +436,8 @@ public Hub(
 
   @Override
   public void enterTransaction() {
+    // Note: txStack.enter(); happens at traceStartTransaction as it requires world, etc
+    state.enter();
     transients.conflation().stackHeightChecksForStackUnderflows().enter();
     transients.conflation().stackHeightChecksForStackOverflows().enter();
     for (Module m : modules) {
@@ -492,7 +494,6 @@ public void traceEndBlock(final BlockHeader blockHeader, final BlockBody blockBo
 
   public void traceStartTransaction(final WorldView world, final Transaction tx) {
     pch.reset();
-    state.enter();
     txStack.enterTransaction(world, tx, transients.block());
 
     final TransactionProcessingMetadata transactionProcessingMetadata = txStack.current();
diff --git a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/State.java b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/State.java
index 4232b574b6..e311d0c13b 100644
--- a/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/State.java
+++ b/arithmetization/src/main/java/net/consensys/linea/zktracer/module/hub/State.java
@@ -119,11 +119,13 @@ public void enter() {
     } else {
       state.push(this.current().spinOff());
     }
+    lineCounter.enter();
   }
 
   @Override
   public void pop() {
     state.pop();
+    lineCounter.pop();
   }
 
   /** Describes the Hub state during a given transaction. */