diff --git a/common/src/aaredaqlib/beamline.py b/common/src/aaredaqlib/beamline.py
index 44a7d77e..51d4f693 100644
--- a/common/src/aaredaqlib/beamline.py
+++ b/common/src/aaredaqlib/beamline.py
@@ -10,5 +10,8 @@ class MXBeamline(Enum):
 
 
 def mx_beamline() -> MXBeamline:
-    name = os.getenv("BEAMLINE_XNAME", "SIMULATED").strip().upper()
+    name = os.getenv("BEAMLINE_XNAME")
+    if name is None:
+        name = os.getenv("BEAMLINE", "SIMULATED")
+    name=name.strip().upper()
     return MXBeamline[name] if name in MXBeamline.__members__ else MXBeamline.SIMULATED