diff --git a/src/keycloak-theme/account/kcContext.ts b/src/keycloak-theme/account/kcContext.ts
index 56ce923..87df074 100644
--- a/src/keycloak-theme/account/kcContext.ts
+++ b/src/keycloak-theme/account/kcContext.ts
@@ -17,4 +17,4 @@ export const { kcContext } = getKcContext({
 	//mockPageId: "password.ftl",
 });
 
-export type KcContext = NonNullable<typeof kcContext>;
+export type KcContext = NonNullable<ReturnType<typeof getKcContext>["kcContext"]>;
diff --git a/src/keycloak-theme/login/kcContext.ts b/src/keycloak-theme/login/kcContext.ts
index e820959..244b41e 100644
--- a/src/keycloak-theme/login/kcContext.ts
+++ b/src/keycloak-theme/login/kcContext.ts
@@ -98,4 +98,4 @@ export const { kcContext } = getKcContext({
 });
 
 
-export type KcContext = NonNullable<typeof kcContext>;
\ No newline at end of file
+export type KcContext = NonNullable<ReturnType<typeof getKcContext>["kcContext"]>;
\ No newline at end of file