diff --git a/ember-statechart-component/package.json b/ember-statechart-component/package.json
index b3f1981a..4828b613 100644
--- a/ember-statechart-component/package.json
+++ b/ember-statechart-component/package.json
@@ -55,7 +55,7 @@
   },
   "peerDependencies": {
     "@glint/template": ">= 0.8.3",
-    "xstate": "^4.30.0"
+    "xstate": "^4.32.1"
   },
   "peerDependenciesMeta": {
     "@glint/template": {
diff --git a/ember-statechart-component/src/glint.ts b/ember-statechart-component/src/glint.ts
index a566439b..3e9cb5fe 100644
--- a/ember-statechart-component/src/glint.ts
+++ b/ember-statechart-component/src/glint.ts
@@ -1,31 +1,33 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ComponentLike } from '@glint/template';
 import type {
+  AnyStateMachine,
   ContextFrom,
-  createMachine,
   EventFrom,
   Interpreter,
   MachineConfig,
+  StateFrom,
+  StateMachine,
   StateSchema,
 } from 'xstate';
 
+type StateSchemaFrom<T> = T extends StateMachine<any, infer U, any> ? U : StateSchema;
+
 export type State<T = unknown> = Interpreter<ContextFrom<T>>['state'];
 export type Send<T = unknown> = Interpreter<ContextFrom<T>>['send'];
 export type OnTransition<T = unknown> = Interpreter<ContextFrom<T>>['onTransition'];
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type MachineComponent<T extends ReturnType<typeof createMachine> = any> = ComponentLike<{
+export type MachineComponent<T extends AnyStateMachine = any> = ComponentLike<{
   Args: {
-    config?: MachineConfig<ContextFrom<T>, StateSchema<T>, EventFrom<T>>;
-    context?: State<T>['context'];
-    state?: State<T>;
+    config?: MachineConfig<ContextFrom<T>, StateSchemaFrom<T>, EventFrom<T>>;
+    context?: StateFrom<T>['context'];
+    state?: StateFrom<T>;
   };
   Blocks: {
     default: [State<T>, Send<T>, OnTransition<T>];
   };
 }>;
 
-export function asComponent<T extends typeof createMachine>(
-  machine: T
-): MachineComponent<ReturnType<T>> {
-  return machine as unknown as MachineComponent<ReturnType<T>>;
+export function asComponent<T extends AnyStateMachine = any>(machine: T): MachineComponent<T> {
+  return machine as unknown as MachineComponent<T>;
 }