diff --git a/src/judas_client/client.py b/src/judas_client/client.py
index cde27d0..799dfa0 100644
--- a/src/judas_client/client.py
+++ b/src/judas_client/client.py
@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import logging as lg
+import os
 import uuid
 
 from judas_protocol import Message
@@ -29,7 +30,14 @@ class Client:
         self.server_host: str = server_host
         self.server_port: int = server_port
 
-        self.mac_address: str = self._get_mac_address()
+        if "JUDAS_ID" in os.environ:
+            self.mac_address: str = os.environ["JUDAS_ID"]
+            self.logger.debug(
+                f"Using MAC address from environment variable JUDAS_ID: {self.mac_address}"
+            )
+        else:
+            self.mac_address = self._get_mac_address()
+
         self.logger.debug(f"MAC address: {self.mac_address}")
 
         self.connector: Connector = Connector(