diff --git a/exir/emit/_emit_program.py b/exir/emit/_emit_program.py
index 131daf6511..923b837dd7 100644
--- a/exir/emit/_emit_program.py
+++ b/exir/emit/_emit_program.py
@@ -175,7 +175,6 @@ def emit_program(
             values=[],
             operators=[],
             delegates=[],
-            num_values=0,
             operator_cache={},
             delegate_cache={},
             emit_stacktrace=emit_stacktrace,
diff --git a/exir/emit/_emitter.py b/exir/emit/_emitter.py
index f6dfcc4be1..23fe259b3e 100644
--- a/exir/emit/_emitter.py
+++ b/exir/emit/_emitter.py
@@ -126,7 +126,6 @@ class _EmitterState:
     values: List[EValue]
     operators: List[Operator]
     delegates: List[BackendDelegate]
-    num_values: int
     operator_cache: Dict[Tuple[str, str], int]
     delegate_cache: Dict[bytes, int]
     emit_stacktrace: bool
@@ -493,11 +492,9 @@ def _emit_evalue(self, val: EValue) -> _AbstractValue:
         Given an Evalue, adds it to the emitter_state's values table, and returns the AbstractValue
         representing it.
         """
-        ret = self.emitter_state.num_values
         self.emitter_state.values.append(val)
-        self.emitter_state.num_values += 1
         tensor = val.val if isinstance(val.val, Tensor) else None
-        return _AbstractValue(ret, tensor)
+        return _AbstractValue(len(self.emitter_state.values) - 1, tensor)
 
     def _emit_spec(self, spec: ValueSpec) -> _EmitterValue:
         """Given the provided spec constructs the corresponding EValue from it and then emits it."""