diff --git a/sw/src/userspace/puzzlefw.hpp b/sw/src/userspace/puzzlefw.hpp
index ebc6d2c..049617c 100644
--- a/sw/src/userspace/puzzlefw.hpp
+++ b/sw/src/userspace/puzzlefw.hpp
@@ -732,7 +732,6 @@ public:
         // Set up DMA buffer segment.
         m_device.write_reg(m_reg.addr_start, m_buf_start);
         m_device.write_reg(m_reg.addr_end, m_buf_end);
-        m_device.write_reg(m_reg.addr_limit, m_buf_end - POINTER_MARGIN);
 
         // Initialize DMA stream and reset write pointer.
         init();
@@ -791,6 +790,9 @@ public:
 
         // Reset read pointer.
         m_read_pointer = m_buf_start;
+
+        // Reset write limit pointer.
+        m_device.write_reg(m_reg.addr_limit, m_buf_end - POINTER_MARGIN);
     }
 
     /** Return the number of bytes available in the DMA buffer. */