diff --git a/packages/react/xr/src/input.tsx b/packages/react/xr/src/input.tsx
index 432ca26..f0add3d 100644
--- a/packages/react/xr/src/input.tsx
+++ b/packages/react/xr/src/input.tsx
@@ -36,8 +36,13 @@ export function useXRInputSourceStateContext<T extends keyof XRInputSourceStateM
   type?: T,
 ): XRInputSourceStateMap[T] {
   const state = useContext(xrInputSourceStateContext)
-  if (state == null || (type != null && state.type != type)) {
-    throw new Error(`useXRInputSourceStateContext() can only be used inside a the xr store config`)
+  if (state == null) {
+    throw new Error(`useXRInputSourceStateContext() can only be used inside the xr store config`)
+  }
+  if (type != null && state.type != type) {
+    throw new Error(
+      `useXRInputSourceStateContext(${type}) can not be used inside a component for input type "${state.type}"`,
+    )
   }
   return state as XRInputSourceStateMap[T]
 }
diff --git a/packages/react/xr/src/space.tsx b/packages/react/xr/src/space.tsx
index 2eefec6..23eb691 100644
--- a/packages/react/xr/src/space.tsx
+++ b/packages/react/xr/src/space.tsx
@@ -29,7 +29,7 @@ export const XRSpace = forwardRef<
 >(({ space, children }, ref) => {
   const internalRef = useRef<Group | null>(null)
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const resolvedSpace = useXRSpace(space as any)
+  const resolvedSpace = typeof space === 'string' ? useXRSpace(space) : space
   useImperativeHandle(ref, () => internalRef.current!, [])
   useApplyXRSpaceMatrix(internalRef, resolvedSpace)
   const setRef = useCallback((group: Group | null) => {
@@ -57,10 +57,12 @@ export type XRHandJointSpaceType = XRHandJoint
  */
 export function useXRSpace(): XRSpace
 
-export function useXRSpace(type: XRInputSourceSpaceType | XRHandJointSpaceType): XRSpace | undefined
-
 export function useXRSpace(type: XRReferenceSpaceType): XRReferenceSpace | undefined
 
+export function useXRSpace(
+  type: XRInputSourceSpaceType | XRHandJointSpaceType | XRReferenceSpaceType,
+): XRSpace | undefined
+
 export function useXRSpace(type?: XRSpaceType): XRSpace | XRReferenceSpace | undefined {
   switch (type) {
     case 'grip-space':