diff --git a/src/api/l_headset.c b/src/api/l_headset.c
index c62a0945..3a883286 100644
--- a/src/api/l_headset.c
+++ b/src/api/l_headset.c
@@ -48,6 +48,10 @@ StringEntry Devices[] = {
   [DEVICE_HAND_RIGHT_FINGER_MIDDLE] = ENTRY("hand/right/finger/middle"),
   [DEVICE_HAND_RIGHT_FINGER_RING] = ENTRY("hand/right/finger/ring"),
   [DEVICE_HAND_RIGHT_FINGER_PINKY] = ENTRY("hand/right/finger/pinky"),
+  [DEVICE_BEACON_1] = ENTRY("beacon/1"),
+  [DEVICE_BEACON_2] = ENTRY("beacon/2"),
+  [DEVICE_BEACON_3] = ENTRY("beacon/3"),
+  [DEVICE_BEACON_4] = ENTRY("beacon/4"),
   { 0 }
 };
 
diff --git a/src/modules/headset/headset.h b/src/modules/headset/headset.h
index 54861403..0fb2abf2 100644
--- a/src/modules/headset/headset.h
+++ b/src/modules/headset/headset.h
@@ -43,6 +43,10 @@ typedef enum {
   DEVICE_HAND_RIGHT_FINGER_MIDDLE,
   DEVICE_HAND_RIGHT_FINGER_RING,
   DEVICE_HAND_RIGHT_FINGER_PINKY,
+  DEVICE_BEACON_1,
+  DEVICE_BEACON_2,
+  DEVICE_BEACON_3,
+  DEVICE_BEACON_4,
   MAX_DEVICES
 } Device;
 
diff --git a/src/modules/headset/openvr.c b/src/modules/headset/openvr.c
index de13f3ed..9bb29c69 100755
--- a/src/modules/headset/openvr.c
+++ b/src/modules/headset/openvr.c
@@ -75,9 +75,9 @@ static struct {
   VRActionHandle_t axisActions[2][MAX_AXES];
   VRActionHandle_t skeletonActions[2];
   VRActionHandle_t hapticActions[2];
-  TrackedDevicePose_t headPose;
-  RenderModel_t* deviceModels[16];
-  RenderModel_TextureMap_t* deviceTextures[16];
+  TrackedDevicePose_t renderPoses[64];
+  RenderModel_t* deviceModels[64];
+  RenderModel_TextureMap_t* deviceTextures[64];
   Canvas* canvas;
   float* mask;
   float boundsGeometry[16];
@@ -287,7 +287,7 @@ static bool openvr_getViewPose(uint32_t view, float* position, float* orientatio
   EVREye eye = view ? EVREye_Eye_Right : EVREye_Eye_Left;
 
   float transform[16], offset[16];
-  mat4_fromMat34(transform, state.headPose.mDeviceToAbsoluteTracking.m);
+  mat4_fromMat34(transform, state.renderPoses[k_unTrackedDeviceIndex_Hmd].mDeviceToAbsoluteTracking.m);
   mat4_multiply(transform, mat4_fromMat34(offset, state.system->GetEyeToHeadTransform(eye).m));
   mat4_getPosition(transform, position);
   mat4_getOrientation(transform, orientation);
@@ -340,11 +340,25 @@ static bool openvr_getPose(Device device, vec3 position, quat orientation) {
 
   // Early exit for head pose
   if (device == DEVICE_HEAD) {
-    mat4_fromMat34(transform, state.headPose.mDeviceToAbsoluteTracking.m);
+    mat4_fromMat34(transform, state.renderPoses[k_unTrackedDeviceIndex_Hmd].mDeviceToAbsoluteTracking.m);
     transform[13] += state.offset;
     mat4_getPosition(transform, position);
     mat4_getOrientation(transform, orientation);
-    return state.headPose.bPoseIsValid;
+    return state.renderPoses[k_unTrackedDeviceIndex_Hmd].bPoseIsValid;
+  }
+
+  if (device >= DEVICE_BEACON_1 && device <= DEVICE_BEACON_4) {
+    TrackedDeviceIndex_t devices[4];
+    ETrackedDeviceClass class = ETrackedDeviceClass_TrackedDeviceClass_TrackingReference;
+    uint32_t count = state.system->GetSortedTrackedDeviceIndicesOfClass(class, devices, 4, 0);
+    uint32_t index = device - DEVICE_BEACON_1;
+    if (index >= count) return false;
+    TrackedDevicePose_t* pose = &state.renderPoses[devices[index]];
+    mat4_fromMat34(transform, pose->mDeviceToAbsoluteTracking.m);
+    transform[13] += state.offset;
+    mat4_getPosition(transform, position);
+    mat4_getOrientation(transform, orientation);
+    return pose->bPoseIsValid;
   }
 
   Device hand;
@@ -408,7 +422,7 @@ static bool openvr_getVelocity(Device device, vec3 velocity, vec3 angularVelocit
   TrackedDevicePose_t* pose;
 
   if (device == DEVICE_HEAD) {
-    pose = &state.headPose;
+    pose = &state.renderPoses[k_unTrackedDeviceIndex_Hmd];
   } else if (device == DEVICE_HAND_LEFT || device == DEVICE_HAND_RIGHT) {
     state.input->GetPoseActionData(state.poseActions[device], state.compositor->GetTrackingSpace(), 0.f, &actionData, sizeof(actionData), 0);
     pose = &actionData.pose;
@@ -656,7 +670,7 @@ static void openvr_renderTo(void (*callback)(void*), void* userdata) {
   Camera camera = { .canvas = state.canvas };
 
   float head[16];
-  mat4_fromMat34(head, state.headPose.mDeviceToAbsoluteTracking.m);
+  mat4_fromMat34(head, state.renderPoses[k_unTrackedDeviceIndex_Hmd].mDeviceToAbsoluteTracking.m);
 
   for (int i = 0; i < 2; i++) {
     float eye[16];
@@ -687,7 +701,7 @@ static Texture* openvr_getMirrorTexture(void) {
 }
 
 static void openvr_update(float dt) {
-  state.compositor->WaitGetPoses(&state.headPose, 1, NULL, 0);
+  state.compositor->WaitGetPoses(state.renderPoses, sizeof(state.renderPoses) / sizeof(state.renderPoses[0]), NULL, 0);
   VRActiveActionSet_t activeActionSet = { .ulActionSet = state.actionSet };
   state.input->UpdateActionState(&activeActionSet, sizeof(activeActionSet), 1);