diff --git a/packages/hiccup-canvas/src/draw.ts b/packages/hiccup-canvas/src/draw.ts
index d71f92e782..59a75fd342 100644
--- a/packages/hiccup-canvas/src/draw.ts
+++ b/packages/hiccup-canvas/src/draw.ts
@@ -1,3 +1,4 @@
+import type { Maybe } from "@thi.ng/api";
 import { implementsFunction } from "@thi.ng/checks/implements-function";
 import { isArray } from "@thi.ng/checks/is-array";
 import type { DrawState } from "./api.js";
@@ -153,7 +154,7 @@ export const draw = (
 
 const defs = (
 	ctx: CanvasRenderingContext2D,
-	state: DrawState | undefined,
+	state: Maybe<DrawState>,
 	pstate: DrawState,
 	shape: any[]
 ) => {
diff --git a/packages/hiccup-canvas/src/internal/state.ts b/packages/hiccup-canvas/src/internal/state.ts
index 1e9e26e173..b693ade6aa 100644
--- a/packages/hiccup-canvas/src/internal/state.ts
+++ b/packages/hiccup-canvas/src/internal/state.ts
@@ -1,4 +1,4 @@
-import type { IObjectOf } from "@thi.ng/api";
+import type { IObjectOf, Maybe } from "@thi.ng/api";
 import { isArrayLike } from "@thi.ng/checks/is-arraylike";
 import type { DrawState } from "../api.js";
 import { resolveGradientOrColor } from "../color.js";
@@ -64,7 +64,7 @@ export const __mergeState = (
 	state: DrawState,
 	attribs: IObjectOf<any>
 ) => {
-	let res: DrawState | undefined;
+	let res: Maybe<DrawState>;
 	if (!attribs) return;
 	if (applyTransform(ctx, attribs)) {
 		res = __newState(state, true);