diff --git a/app/src/openxr/cpp/OpenXRInput.cpp b/app/src/openxr/cpp/OpenXRInput.cpp
index 4e3c5ee913..a30db57ffd 100644
--- a/app/src/openxr/cpp/OpenXRInput.cpp
+++ b/app/src/openxr/cpp/OpenXRInput.cpp
@@ -227,7 +227,8 @@ void OpenXRInput::UpdateTrackedKeyboard(const XrFrameState& frameState, XrSpace
     .flags = XR_KEYBOARD_TRACKING_QUERY_LOCAL_BIT_FB,
   };
   XrKeyboardTrackingDescriptionFB kbdDesc;
-  CHECK_XRCMD(OpenXRExtensions::xrQuerySystemTrackedKeyboardFB(mSession, &queryInfo, &kbdDesc));
+  if (XR_FAILED(OpenXRExtensions::xrQuerySystemTrackedKeyboardFB(mSession, &queryInfo, &kbdDesc)))
+    return;
 
   // Check if existing keyboard disappeared or changed, and clear up its state if so
   if ((kbdDesc.flags & XR_KEYBOARD_TRACKING_EXISTS_BIT_FB) == 0 ||