diff --git a/litex/soc/interconnect/axi/axi_lite.py b/litex/soc/interconnect/axi/axi_lite.py
index 4e0b357a2..273bc08ba 100644
--- a/litex/soc/interconnect/axi/axi_lite.py
+++ b/litex/soc/interconnect/axi/axi_lite.py
@@ -168,6 +168,8 @@ def axi_lite_to_simple(axi_lite, port_adr, port_dat_r, port_dat_w=None, port_we=
         else:
             comb.append(port_we.eq(axi_lite.w.valid & axi_lite.w.ready & (axi_lite.w.strb != 0)))
 
+    port_adr_reg = Signal(len(port_adr))
+
     fsm = FSM()
     fsm.act("START-TRANSACTION",
         # If the last access was a read, do a write, and vice versa.
@@ -186,12 +188,24 @@ def axi_lite_to_simple(axi_lite, port_adr, port_dat_r, port_dat_w=None, port_we=
             If(axi_lite.w.valid,
                 axi_lite.w.ready.eq(1),
                 NextState("SEND-WRITE-RESPONSE")
+            ).Else(
+                # write data is not yet available - register the address
+                # and wait until the master provides the data
+                NextValue(port_adr_reg, port_adr),
+                NextState("WAIT-FOR-WRITE-DATA")
             )
         ).Elif(do_read,
             port_adr.eq(axi_lite.ar.addr[adr_shift:]),
             NextState("LATCH-READ-RESPONSE"),
         )
     )
+    fsm.act("WAIT-FOR-WRITE-DATA",
+        port_adr.eq(port_adr_reg),
+        If(axi_lite.w.valid,
+            axi_lite.w.ready.eq(1),
+            NextState("SEND-WRITE-RESPONSE")
+        )
+    ),
     fsm.act("LATCH-READ-RESPONSE",
         NextValue(port_dat_r_latched, port_dat_r),
         NextState("SEND-READ-RESPONSE")