diff --git a/src/aare/daq/devices.py b/src/aare/daq/devices.py
index 0bb45df4..200c9ead 100644
--- a/src/aare/daq/devices.py
+++ b/src/aare/daq/devices.py
@@ -108,6 +108,8 @@ class BeamlineDevices:
             getpv = f"{BEAMLINE}-ES-SSFI:TRANSM-GET"
         )
 
+        self.__fast_shutter = PV(f"{BEAMLINE}-ES-SHUTTER:SET")
+
         self.magnet_position_sensor = PV(f"{BEAMLINE}-ES-DFS:CBOX-CMP1")
         self.magnet_position_sensor_readout = PV(f"{BEAMLINE}-ES-DFS:CBOX-USER1")
         #self.magnet_position_sensor_readout = PV(f"{BEAMLINE}-ES-DFS:CBOX-REFVAL1")
@@ -234,11 +236,11 @@ class BeamlineDevices:
     # Shutter
     @property
     def shutter(self) -> bool:
-        return False
+        return self.__fast_shutter.get()
 
     @shutter.setter
     def shutter(self, opened: bool):
-        pass
+        self.__fast_shutter.put(opened)
 
 # Sample camera
     @property