diff --git a/litex/soc/tools/remote/client.py b/litex/soc/tools/remote/client.py
index 92510c1ce..99e229c2f 100644
--- a/litex/soc/tools/remote/client.py
+++ b/litex/soc/tools/remote/client.py
@@ -8,7 +8,8 @@ from litex.soc.tools.remote.csr_builder import CSRBuilder
 
 class RemoteClient(EtherboneIPC, CSRBuilder):
     def __init__(self, host="localhost", port=1234, csr_csv="csr.csv", csr_data_width=32, debug=False):
-        CSRBuilder.__init__(self, self, csr_csv, csr_data_width)
+        if csr_csv is not None:
+            CSRBuilder.__init__(self, self, csr_csv, csr_data_width)
         self.host = host
         self.port = port
         self.debug = debug