diff --git a/CHANGELOG.md b/CHANGELOG.md
index be252bc857..1ce5e303a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 #### Upcoming Changes
 
+* fix: `mod_builtin_fill_memory` raises when `n=0` [#1935](https://github.com/lambdaclass/cairo-vm/pull/1935)
+
 * fix(BREAKING): Fix no trace padding flow in proof mode [#1909](https://github.com/lambdaclass/cairo-vm/pull/1909)
 
 * refactor: Limit ret opcode decodeing to Cairo0's standards. [#1925](https://github.com/lambdaclass/cairo-vm/pull/1925)
diff --git a/vm/src/vm/vm_core.rs b/vm/src/vm/vm_core.rs
index c04fd3721e..25b7225265 100644
--- a/vm/src/vm/vm_core.rs
+++ b/vm/src/vm/vm_core.rs
@@ -1119,6 +1119,9 @@ impl VirtualMachine {
             VirtualMachineError,
         > {
             if let Some((ptr, n)) = mod_params {
+                if n == 0 {
+                    return Ok(None);
+                }
                 let mod_builtin = self
                     .builtin_runners
                     .iter()