diff --git a/litex/soc/cores/spi_flash.py b/litex/soc/cores/spi_flash.py
index b00e6fc60..d2b8fd5cf 100644
--- a/litex/soc/cores/spi_flash.py
+++ b/litex/soc/cores/spi_flash.py
@@ -337,9 +337,9 @@ class S7SPIFlash(Module, AutoCSR):
             pads.vpp.reset = 1
         if hasattr(pads, "hold"):
             pads.hold.reset = 1
-
+        if hasattr(pads, "cs_n"):
+            self.comb += pads.cs_n.eq(spi.pads.cs_n)
         self.comb += [
-            pads.cs_n.eq(spi.pads.cs_n),
             pads.mosi.eq(spi.pads.mosi),
             spi.pads.miso.eq(pads.miso)
         ]